diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
index 24a4203a9e..7ec022023a 100644
--- a/addons/common/XEH_preInit.sqf
+++ b/addons/common/XEH_preInit.sqf
@@ -195,10 +195,6 @@ PREP(getDefinedVariable);
 PREP(getAllDefinedSetVariables);
 PREP(getDefinedVariableInfo);
 PREP(getDefinedVariableDefault);
-PREP(sendHintTo);
-PREP(sendMessageTo);
-PREP(sendDisplayInformationTo);
-PREP(sendDisplayMessageTo);
 PREP(getDeathAnim);
 PREP(insertionSort);
 PREP(uniqueElementsOnly);
diff --git a/addons/gui/XEH_preInit.sqf b/addons/gui/XEH_preInit.sqf
index 9fbe0ac09d..b3de51cd9b 100644
--- a/addons/gui/XEH_preInit.sqf
+++ b/addons/gui/XEH_preInit.sqf
@@ -20,5 +20,9 @@ PREP(displayIcon);
 PREP(effectPain);
 PREP(effectBleeding);
 PREP(effectBlackOut);
+PREP(sendHintTo);
+PREP(sendMessageTo);
+PREP(sendDisplayInformationTo);
+PREP(sendDisplayMessageTo);
 
 ADDON = true;
\ No newline at end of file
diff --git a/addons/common/functions/fnc_sendDisplayInformationTo.sqf b/addons/gui/functions/fnc_sendDisplayInformationTo.sqf
similarity index 99%
rename from addons/common/functions/fnc_sendDisplayInformationTo.sqf
rename to addons/gui/functions/fnc_sendDisplayInformationTo.sqf
index 50e8eec86e..ae4012b5fe 100644
--- a/addons/common/functions/fnc_sendDisplayInformationTo.sqf
+++ b/addons/gui/functions/fnc_sendDisplayInformationTo.sqf
@@ -21,7 +21,6 @@ if (isPlayer _reciever) then {
 	if (!local _reciever) then {
 		[_this, QUOTE(FUNC(sendDisplayInformationTo)), _reciever, false] call EFUNC(common,execRemoteFnc);
 	} else {
-
 		if (isLocalized _title) then {
 			_title = localize _title;
 		};
diff --git a/addons/common/functions/fnc_sendDisplayMessageTo.sqf b/addons/gui/functions/fnc_sendDisplayMessageTo.sqf
similarity index 97%
rename from addons/common/functions/fnc_sendDisplayMessageTo.sqf
rename to addons/gui/functions/fnc_sendDisplayMessageTo.sqf
index 03313ce8ea..c66af97266 100644
--- a/addons/common/functions/fnc_sendDisplayMessageTo.sqf
+++ b/addons/gui/functions/fnc_sendDisplayMessageTo.sqf
@@ -17,8 +17,6 @@ _content =  [_this, 2, "",[""]] call BIS_fnc_Param;
 _type =  [_this, 3, 0,[0]] call BIS_fnc_Param;
 _parameters = [_this, 4, [], [[]]] call BIS_fnc_Param;
 
-[_this] call FUNC(debug);
-
 if (isPlayer _reciever) then {
 	if (!local _reciever) then {
 		[_this, QUOTE(FUNC(sendDisplayMessageTo)), _reciever, false] call EFUNC(common,execRemoteFnc);
diff --git a/addons/common/functions/fnc_sendHintTo.sqf b/addons/gui/functions/fnc_sendHintTo.sqf
similarity index 66%
rename from addons/common/functions/fnc_sendHintTo.sqf
rename to addons/gui/functions/fnc_sendHintTo.sqf
index 7da36cb0df..0454cc5691 100644
--- a/addons/common/functions/fnc_sendHintTo.sqf
+++ b/addons/gui/functions/fnc_sendHintTo.sqf
@@ -13,12 +13,14 @@
 private ["_reciever","_message"];
 _reciever = _this select 0;
 _message = _this select 1;
-//[_reciever,_message] call cms_fnc_sendChatMessageTo;
 
 if (isPlayer _reciever) then {
 	if (!local _reciever) then {
-		[_this, QUOTE(FUNC(sendHintTo)), _reciever, false] spawn EFUNC(common,execRemoteFnc);
+		[_this, QUOTE(FUNC(sendHintTo)), _reciever, false] call EFUNC(common,execRemoteFnc);
 	} else {
-		 hintsilent format ["%1",_message];
+		if (isLocalized _message) then {
+			_message = localize _message;
+		};
+		hintsilent format ["%1",_message];
 	};
 };
\ No newline at end of file
diff --git a/addons/common/functions/fnc_sendMessageTo.sqf b/addons/gui/functions/fnc_sendMessageTo.sqf
similarity index 64%
rename from addons/common/functions/fnc_sendMessageTo.sqf
rename to addons/gui/functions/fnc_sendMessageTo.sqf
index 17f5731d3a..a4e0e4ccd5 100644
--- a/addons/common/functions/fnc_sendMessageTo.sqf
+++ b/addons/gui/functions/fnc_sendMessageTo.sqf
@@ -17,8 +17,15 @@ _message = _this select 1;
 
 if (isPlayer _reciever) then {
 	if (!local _reciever) then {
-	[_this, QUOTE(FUNC(sendMessageTo)), _reciever, false] spawn EFUNC(common,execRemoteFnc);
+	[_this, QUOTE(FUNC(sendMessageTo)), _reciever, false] call EFUNC(common,execRemoteFnc);
 	} else {
+		if (isnil QGVAR(LOGIC_OBJECT)) exitwith {
+			// need to  create an object instead
+		};
+
+		if (isLocalized _message) then {
+			_message = localize _message;
+		};
 		GVAR(LOGIC_OBJECT) globalChat format ["%1",_message];
 	};
 };