diff --git a/Modules/Commander.lua b/Modules/Commander.lua
index ed68e94..5792d91 100644
--- a/Modules/Commander.lua
+++ b/Modules/Commander.lua
@@ -311,7 +311,8 @@ function shared.Commander.Init()
 							data = channelname,
 							message = message
 						}
-						table.insert(shared.messenger.queue, msg)
+						--table.insert(shared.messenger.queue, msg)
+						table.insert(shared.networkMessenger.queue, msg)
 					end
 				end
 			end
diff --git a/Modules/Whoer.lua b/Modules/Whoer.lua
index d058987..cba56d5 100644
--- a/Modules/Whoer.lua
+++ b/Modules/Whoer.lua
@@ -198,7 +198,8 @@ function shared.Whoer.Init()
 			data = Heimdall_Data.config.who.notifyChannel,
 			message = text
 		}
-		table.insert(shared.messenger.queue, msg)
+		--table.insert(shared.messenger.queue, msg)
+		table.insert(shared.networkMessenger.queue, msg)
 
 		if Heimdall_Data.config.who.doWhisper then
 			if Heimdall_Data.config.who.debug then
@@ -215,7 +216,8 @@ function shared.Whoer.Init()
 				if Heimdall_Data.config.who.debug then
 					print(string.format("[%s] Queuing whisper to %s", ModuleName, name))
 				end
-				table.insert(shared.messenger.queue, msg)
+				--table.insert(shared.messenger.queue, msg)
+				table.insert(shared.networkMessenger.queue, msg)
 			end
 		end
 
@@ -226,7 +228,8 @@ function shared.Whoer.Init()
 				data = Heimdall_Data.config.who.notifyChannel .. "ru",
 				message = player:NotifyRu()
 			}
-			table.insert(shared.messenger.queue, ruMsg)
+			--table.insert(shared.messenger.queue, ruMsg)
+			table.insert(shared.networkMessenger.queue, ruMsg)
 		end
 
 		return nil
@@ -255,7 +258,8 @@ function shared.Whoer.Init()
 			data = Heimdall_Data.config.who.notifyChannel,
 			message = text
 		}
-		table.insert(shared.messenger.queue, msg)
+		--table.insert(shared.messenger.queue, msg)
+		table.insert(shared.networkMessenger.queue, msg)
 
 		text = string.format(shared.L.ru.whoerMoved,
 			player.name,
@@ -271,8 +275,8 @@ function shared.Whoer.Init()
 			data = Heimdall_Data.config.who.notifyChannel .. "ru",
 			message = text
 		}
-		table.insert(shared.messenger.queue, msg)
-
+		--table.insert(shared.messenger.queue, msg)
+		table.insert(shared.networkMessenger.queue, msg)
 		if Heimdall_Data.config.who.doWhisper then
 			for _, name in pairs(Heimdall_Data.config.whisperNotify) do
 				---@type Message
@@ -281,7 +285,8 @@ function shared.Whoer.Init()
 					data = name,
 					message = text
 				}
-				table.insert(shared.messenger.queue, msg)
+				--table.insert(shared.messenger.queue, msg)
+				table.insert(shared.networkMessenger.queue, msg)
 			end
 		end
 
@@ -309,7 +314,8 @@ function shared.Whoer.Init()
 			data = Heimdall_Data.config.who.notifyChannel,
 			message = text
 		}
-		table.insert(shared.messenger.queue, msg)
+		--table.insert(shared.messenger.queue, msg)
+		table.insert(shared.networkMessenger.queue, msg)
 
 		text = string.format(shared.L.ru.whoerGone,
 			player.name,
@@ -323,7 +329,8 @@ function shared.Whoer.Init()
 			data = Heimdall_Data.config.who.notifyChannel .. "ru",
 			message = text
 		}
-		table.insert(shared.messenger.queue, msg)
+		--table.insert(shared.messenger.queue, msg)
+		table.insert(shared.networkMessenger.queue, msg)
 
 		if Heimdall_Data.config.who.doWhisper then
 			for _, name in pairs(Heimdall_Data.config.whisperNotify) do
@@ -333,7 +340,8 @@ function shared.Whoer.Init()
 					data = name,
 					message = text
 				}
-				table.insert(shared.messenger.queue, msg)
+				--table.insert(shared.messenger.queue, msg)
+				table.insert(shared.networkMessenger.queue, msg)
 			end
 		end