diff --git a/data/gui/message_window.ui b/data/gui/message_window.ui
index 5e97df69e..da9982ba4 100644
--- a/data/gui/message_window.ui
+++ b/data/gui/message_window.ui
@@ -1,33 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="message_window">
-    <property name="default_width">480</property>
-    <property name="default_height">440</property>
-    <child>
-      <object class="GtkAlignment" id="msg_window_alignment">
-        <property name="visible">True</property>
-        <property name="top_padding">2</property>
-        <child>
-          <object class="GtkNotebook" id="notebook">
-            <property name="visible">True</property>
-            <property name="scrollable">True</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkEventBox" id="chat_tab_ebox">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="visible_window">False</property>
     <child>
       <object class="GtkHBox" id="tab_hbox">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="spacing">4</property>
         <child>
           <object class="GtkImage" id="tab_image">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="stock">gtk-missing-image</property>
           </object>
           <packing>
@@ -38,25 +24,32 @@
         </child>
         <child>
           <object class="GtkLabel" id="tab_label">
+            <property name="width_request">70</property>
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="xalign">0</property>
             <property name="use_markup">True</property>
             <property name="ellipsize">end</property>
             <property name="max_width_chars">9</property>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkButton" id="tab_close_button">
+            <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
+            <property name="use_action_appearance">False</property>
             <property name="relief">none</property>
             <child>
               <object class="GtkImage" id="image1329">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="stock">gtk-close</property>
                 <property name="icon-size">1</property>
               </object>
@@ -71,4 +64,23 @@
       </object>
     </child>
   </object>
+  <object class="GtkWindow" id="message_window">
+    <property name="can_focus">False</property>
+    <property name="default_width">480</property>
+    <property name="default_height">440</property>
+    <child>
+      <object class="GtkAlignment" id="msg_window_alignment">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="top_padding">2</property>
+        <child>
+          <object class="GtkNotebook" id="notebook">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="scrollable">True</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
 </interface>