1 files changed, 2 insertions, 19 deletions
diff --git a/src/commands.cpp b/src/commands.cpp
index 80e276d8b..1beba22d5 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -88,7 +88,7 @@ static void outString(ChatTab *const tab, const std::string &str,
 {
     if (!tab)
     {
-        Net::getChatHandler()->me(def);
+        Net::getChatHandler()->me(def, GENERAL_CHANNEL);
         return;
     }
 
@@ -114,7 +114,7 @@ static void outString(ChatTab *const tab, const std::string &str,
             break;
         }
         default:
-            Net::getChatHandler()->me(def);
+            Net::getChatHandler()->me(def, GENERAL_CHANNEL);
             break;
     }
 }
@@ -362,23 +362,6 @@ impHandler0(cleanFonts)
         debugChatTab->chatLog(_("Cache cleaned"));
 }
 
-impHandler(join)
-{
-    if (!tab)
-        return;
-
-    const size_t pos = args.find(' ');
-    const std::string name(args, 0, pos);
-    const std::string password(args, pos + 1);
-    tab->chatLog(strprintf(_("Requesting to join channel %s."), name.c_str()));
-    Net::getChatHandler()->enterChannel(name, password);
-}
-
-impHandler0(listChannels)
-{
-    Net::getChatHandler()->channelList();
-}
-
 impHandler(createParty)
 {
     if (!tab)