diff --git a/CHANGELOG.md b/CHANGELOG.md
index efb159c..83c759e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,12 @@
 - build in release mode now no longer spams warnings
 - build now correctly installs all build plugin libs
 - a bug where the correction message was received, the indication was on but the text didn't actually change
+- message body now doesn't intecept context menu from the whole message
+- message input now doesn't increase font when you remove everything from it
 
 ### Improvements
 - reduced amount of places where platform specific path separator is used
+- now message input is automatically focused when you open a dialog or a room
 
 ### New features
 - the settings are here! You con config different stuff from there
diff --git a/ui/widgets/conversation.cpp b/ui/widgets/conversation.cpp
index 02aefb4..da3d187 100644
--- a/ui/widgets/conversation.cpp
+++ b/ui/widgets/conversation.cpp
@@ -94,7 +94,6 @@ Conversation::Conversation(bool muc, Models::Account* acc, Models::Element* el,
             this, &Conversation::onTextEditDocSizeChanged);
     
     m_ui->messageEditor->installEventFilter(&ker);
-    m_ui->messageEditor->setContextMenuPolicy(Qt::CustomContextMenu);
 
     connect(m_ui->messageEditor, &QTextEdit::customContextMenuRequested, this, &Conversation::onMessageEditorContext);
     connect(pasteImageAction, &QAction::triggered, this, &Conversation::onImagePasted);
@@ -555,3 +554,11 @@ void Conversation::onMessageEditRequested(const QString& id)
         qDebug() << "Ignoring";
     }
 }
+
+void Conversation::showEvent(QShowEvent* event)
+{
+    QWidget::showEvent(event);
+
+    emit shown();
+    m_ui->messageEditor->setFocus();
+}
diff --git a/ui/widgets/conversation.h b/ui/widgets/conversation.h
index 743df71..0c44bd9 100644
--- a/ui/widgets/conversation.h
+++ b/ui/widgets/conversation.h
@@ -103,6 +103,7 @@ protected:
     void dropEvent(QDropEvent* event) override;
     void initializeOverlay();
     virtual void onMessage(const Shared::Message& msg);
+    virtual void showEvent(QShowEvent * event) override;
     
 protected slots:
     void initiateMessageSending();
diff --git a/ui/widgets/conversation.ui b/ui/widgets/conversation.ui
index ce9ad66..1f8b483 100644
--- a/ui/widgets/conversation.ui
+++ b/ui/widgets/conversation.ui
@@ -402,6 +402,9 @@
           <height>30</height>
          </size>
         </property>
+        <property name="contextMenuPolicy">
+         <enum>Qt::CustomContextMenu</enum>
+        </property>
         <property name="autoFillBackground">
          <bool>false</bool>
         </property>
@@ -424,7 +427,7 @@ background-color: transparent
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Liberation Sans'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="acceptRichText">
          <bool>false</bool>
@@ -447,6 +450,7 @@ p, li { white-space: pre-wrap; }
    <class>Badge</class>
    <extends>QFrame</extends>
    <header location="global">ui/utils/badge.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/ui/widgets/messageline/messagedelegate.cpp b/ui/widgets/messageline/messagedelegate.cpp
index 22e8dcb..15a5e46 100644
--- a/ui/widgets/messageline/messagedelegate.cpp
+++ b/ui/widgets/messageline/messagedelegate.cpp
@@ -582,6 +582,7 @@ QLabel * MessageDelegate::getBody(const Models::FeedItem& data) const
     } else {
         result = new QLabel();
         result->setFont(bodyFont);
+        result->setContextMenuPolicy(Qt::NoContextMenu);
         result->setWordWrap(true);
         result->setOpenExternalLinks(true);
         result->setTextInteractionFlags(result->textInteractionFlags() | Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse);