diff --git a/src/EOSConnect/EOSConnect.vala b/src/EOSConnect/EOSConnect.vala
index d84212d425675e5031d90f2a4ddf606fa5410709..c9f0bd96d975289ab136497648d0088853b027fe 100644
--- a/src/EOSConnect/EOSConnect.vala
+++ b/src/EOSConnect/EOSConnect.vala
@@ -73,7 +73,7 @@ namespace EOSConnect {
             });
 
             init_sms_store.begin (() => {
-                init_sms_history_window.begin ();
+                init_sms_history_tab.begin ();
             });
 
 
@@ -115,11 +115,14 @@ namespace EOSConnect {
             SMSStore.instance (main_settings);
         }
 
-        private async void init_sms_history_window () {
+        private async void init_sms_history_tab () {
 
             SimpleAction simple_action = new SimpleAction ("telephony-open-sms-window-reply", null);
             simple_action.activate.connect (() => {
-                sms_history_view.open_sms_window_reply ();
+                // sms_history_view.open_sms_window_reply ();
+                // sms_history_view.show_all ();
+                main_window.main_stack.set_visible_child_name ("sms_history_view");
+                warning ("par ka");
             });
             this.add_action (simple_action);
 
@@ -158,6 +161,10 @@ namespace EOSConnect {
             foreach (var device_entry in devices_map.entries) {
                 bool to_add = true;
 
+                if (device_entry.value.is_paired == false) {
+                    to_add = false;
+                }
+
                 foreach (var device_menuitem in launcher_entry.quicklist.get_children ()) {
 
                     if (((DeviceMenuitem)device_menuitem).id == device_entry.value.device_num) {
diff --git a/src/EOSConnect/MainWindow.vala b/src/EOSConnect/MainWindow.vala
index 93b3758cc06f8191cb0b349bb65e646e37342a72..2a0478040579080dd94111d4f14a473308f497b5 100644
--- a/src/EOSConnect/MainWindow.vala
+++ b/src/EOSConnect/MainWindow.vala
@@ -28,6 +28,7 @@ namespace EOSConnect {
 
         public GLib.Settings main_settings { get; construct; }
         public SMSHistory sms_history_view { get; construct; }
+        public Gtk.Stack main_stack { get; construct; }
 
         private Views.DevicesView devices_view;
         // private Gtk.InfoBar infobar_error;
@@ -79,7 +80,7 @@ namespace EOSConnect {
             devices_view = new Views.DevicesView (this);
             var main_settings_view = new Views.MainSettingsView (this, main_settings);
 
-            var main_stack = new Gtk.Stack ();
+            main_stack = new Gtk.Stack ();
             main_stack.expand = true;
             main_stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT;
             main_stack.add_titled (devices_view, "devices_view", _("Devices"));