diff --git a/main/data/conversation_selector/view.ui b/main/data/conversation_selector/view.ui
index 5d8e2d69..365957a8 100644
--- a/main/data/conversation_selector/view.ui
+++ b/main/data/conversation_selector/view.ui
@@ -5,14 +5,14 @@
         <property name="expand">True</property>
         <property name="orientation">vertical</property>
         <child>
-            <object class="GtkSearchBar" id="search_bar">
+            <object class="GtkRevealer" id="search_revealer">
                 <property name="hexpand">True</property>
-                <property name="show_close_button">True</property>
                 <property name="visible">True</property>
                 <child>
                     <object class="GtkSearchEntry" id="search_entry">
                         <property name="primary_icon_name">edit-find-symbolic</property>
                         <property name="placeholder_text" translatable="yes">Search</property>
+                        <property name="margin">10px</property>
                         <property name="hexpand">True</property>
                         <property name="visible">True</property>
                     </object>
diff --git a/main/data/dino.desktop b/main/data/dino.desktop
index 924cc587..6e2d2016 100644
--- a/main/data/dino.desktop
+++ b/main/data/dino.desktop
@@ -9,4 +9,5 @@ StartupNotify=false
 Terminal=false
 Type=Application
 Categories=GTK;Network;Chat;InstantMessaging;
-X-GNOME-UsesNotifications=true
\ No newline at end of file
+X-GNOME-UsesNotifications=true
+MimeType=x-scheme-handler/xmpp;
diff --git a/main/src/ui/conversation_selector/view.vala b/main/src/ui/conversation_selector/view.vala
index 3ea3148d..fabf5229 100644
--- a/main/src/ui/conversation_selector/view.vala
+++ b/main/src/ui/conversation_selector/view.vala
@@ -11,7 +11,7 @@ public class View : Box {
     public List conversation_list;
 
     [GtkChild] public SearchEntry search_entry;
-    [GtkChild] public SearchBar search_bar;
+    [GtkChild] public Revealer search_revealer;
     [GtkChild] private ScrolledWindow scrolled;
 
     public View(StreamInteractor stream_interactor) {
diff --git a/main/src/ui/conversation_summary/view.vala b/main/src/ui/conversation_summary/view.vala
index 5b49f97e..693f7164 100644
--- a/main/src/ui/conversation_summary/view.vala
+++ b/main/src/ui/conversation_summary/view.vala
@@ -67,7 +67,7 @@ public class View : Box {
         ArrayList<Object> objects = new ArrayList<Object>();
         Gee.List<Entities.Message> messages = stream_interactor.get_module(MessageStorage.IDENTITY).get_messages(conversation);
         if (messages.size > 0) {
-            earliest_message = messages[0];
+            earliest_message = messages[messages.size -1];
             objects.add_all(messages);
         }
         HashMap<Jid, ArrayList<Show>>? shows = stream_interactor.get_module(PresenceManager.IDENTITY).get_shows(conversation.counterpart, conversation.account);
diff --git a/main/src/ui/unified_window.vala b/main/src/ui/unified_window.vala
index e9c1a8e6..8244c67a 100644
--- a/main/src/ui/unified_window.vala
+++ b/main/src/ui/unified_window.vala
@@ -30,7 +30,7 @@ public class UnifiedWindow : Window {
         setup_unified();
         setup_stack();
 
-        conversation_list_titlebar.search_button.bind_property("active", filterable_conversation_list.search_bar, "search-mode-enabled",
+        conversation_list_titlebar.search_button.bind_property("active", filterable_conversation_list.search_revealer, "reveal-child",
                 BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
         paned.bind_property("position", headerbar_paned, "position", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);