3 files changed, 2 insertions, 17 deletions
diff --git a/main/src/ui/chat_input/chat_input_controller.vala b/main/src/ui/chat_input/chat_input_controller.vala
index aca47470..1ec7f3f8 100644
--- a/main/src/ui/chat_input/chat_input_controller.vala
+++ b/main/src/ui/chat_input/chat_input_controller.vala
@@ -172,8 +172,8 @@ public class ChatInputController : Object {
             if (own_jid == null) return;
             if (stream_interactor.get_module(MucManager.IDENTITY).is_moderated_room(conversation.account, conversation.counterpart) &&
                     stream_interactor.get_module(MucManager.IDENTITY).get_role(own_jid, conversation.account) == Xmpp.Xep.Muc.Role.VISITOR) {
-                set_input_field_status(new Plugins.InputFieldStatus(_("This conference does not allow you to send messages. %s").printf("<a href=\"" + OPEN_CONVERSATION_DETAILS_URI + "\">" + _("Request permission") + "</a>"),
-                Plugins.InputFieldStatus.MessageType.ERROR, Plugins.InputFieldStatus.InputState.NO_SEND, true));
+                string msg_str = _("This conference does not allow you to send messages.") + " <a href=\"" + OPEN_CONVERSATION_DETAILS_URI + "\">" + _("Request permission") + "</a>";
+                set_input_field_status(new Plugins.InputFieldStatus(msg_str, Plugins.InputFieldStatus.MessageType.ERROR, Plugins.InputFieldStatus.InputState.NO_SEND, true));
             } else {
                 reset_input_field_status();
             }
diff --git a/main/src/ui/main_window.vala b/main/src/ui/main_window.vala
index afa16645..28e2bbd9 100644
--- a/main/src/ui/main_window.vala
+++ b/main/src/ui/main_window.vala
@@ -15,7 +15,6 @@ public class MainWindow : Gtk.Window {
 
     public WelcomePlceholder welcome_placeholder = new WelcomePlceholder() { visible=true };
     public NoAccountsPlaceholder accounts_placeholder = new NoAccountsPlaceholder() { visible=true };
-    public NoConversationsPlaceholder conversations_placeholder = new NoConversationsPlaceholder() { visible=true };
     public ConversationView conversation_view;
     public ConversationSelector conversation_selector;
     public ConversationTitlebar conversation_titlebar;
@@ -102,7 +101,6 @@ public class MainWindow : Gtk.Window {
         stack.add_named(box, "main");
         stack.add_named(welcome_placeholder, "welcome_placeholder");
         stack.add_named(accounts_placeholder, "accounts_placeholder");
-        stack.add_named(conversations_placeholder, "conversations_placeholder");
         add(stack);
     }
 
@@ -215,17 +213,6 @@ public class NoAccountsPlaceholder : MainWindowPlaceholder {
     }
 }
 
-public class NoConversationsPlaceholder : MainWindowPlaceholder {
-    public NoConversationsPlaceholder() {
-        title_label.label = _("No active conversations");
-        primary_button.label = _("Start Conversation");
-        secondary_button.label = _("Join Channel");
-        title_label.visible = true;
-        label.visible = false;
-        secondary_button.visible = true;
-    }
-}
-
 [GtkTemplate (ui = "/im/dino/Dino/unified_window_placeholder.ui")]
 public class MainWindowPlaceholder : Box {
     [GtkChild] public Label title_label;
diff --git a/main/src/ui/main_window_controller.vala b/main/src/ui/main_window_controller.vala
index 3107527d..65f5aa1d 100644
--- a/main/src/ui/main_window_controller.vala
+++ b/main/src/ui/main_window_controller.vala
@@ -53,8 +53,6 @@ public class MainWindowController : Object {
             dialog.present();
         });
         window.accounts_placeholder.primary_button.clicked.connect(() => { app.activate_action("accounts", null); });
-        window.conversations_placeholder.primary_button.clicked.connect(() => { app.activate_action("add_chat", null); });
-        window.conversations_placeholder.secondary_button.clicked.connect(() => { app.activate_action("add_conference", null); });
         window.conversation_selector.conversation_selected.connect((conversation) => select_conversation(conversation));
 
         window.event.connect((event) => {