diff --git a/src/bitmessagekivy/kivy_helper_search.py b/src/bitmessagekivy/kivy_helper_search.py
index 7e205543..48e77cb2 100644
--- a/src/bitmessagekivy/kivy_helper_search.py
+++ b/src/bitmessagekivy/kivy_helper_search.py
@@ -20,7 +20,7 @@ def search_sql(xAddress="toaddress", account=None, folder="inbox", where=None, w
         sqlStatementBase = '''SELECT label, address From addressbook '''
     else:
         sqlStatementBase = (
-            '''SELECT folder, toaddress, message, fromaddress, subject,'''
+            '''SELECT folder, msgid, toaddress, message, fromaddress, subject,'''
             ''' received, read FROM inbox ''')
 
     sqlStatementParts = []
diff --git a/src/bitmessagekivy/main.kv b/src/bitmessagekivy/main.kv
index b360a534..83183084 100644
--- a/src/bitmessagekivy/main.kv
+++ b/src/bitmessagekivy/main.kv
@@ -25,7 +25,8 @@
 #:set color_font   (0.957, 0.890, 0.843, 1)  # off white
 
 <MyNavigationDrawerIconButton@NavigationDrawerIconButton>:
-    icon: 'checkbox-blank-circle'
+    font_style: 'Body1'
+    theme_text_color: 'Secondary'
 
 <MySpinnerOption@SpinnerOption>:
     font_size: '12.5sp'
@@ -39,7 +40,7 @@
         height: dp(7)
     NavigationDrawerSubheader:
         text: "Accounts"
-    NavigationDrawerIconButton:
+    AddressDropdown:
         CustomSpinner:
             id: btn
             pos_hint:{"x":0,"y":.25}
@@ -57,47 +58,48 @@
                 y: self.parent.y + self.parent.height/4
                 size: self.parent.height/2, self.parent.height/2
             ArrowImg:
-    NavigationDrawerIconButton:
+    MyNavigationDrawerIconButton:
         id: inbox_cnt
         icon: 'email-open'
         text: "Inbox"
         on_release: app.root.ids.scr_mngr.current = 'inbox'
         badge_text: "0"
         on_press: app.load_screen(self)
-    NavigationDrawerIconButton:
+    MyNavigationDrawerIconButton:
         id: send_cnt
         icon: 'send'
         text: "Sent"
+        #use_active: False
         on_release: app.root.ids.scr_mngr.current = 'sent'
         badge_text: "0"
-    NavigationDrawerIconButton:
+    MyNavigationDrawerIconButton:
         id: draft_cnt
         icon: 'message-draw'
         text: "Draft"
         on_release: app.root.ids.scr_mngr.current = 'draft'
         badge_text: "0"
-    #NavigationDrawerIconButton:
+    #MyNavigationDrawerIconButton:
         #text: "Starred"
         #icon:'star'
         #on_release: app.root.ids.scr_mngr.current = 'starred'
         #badge_text: "0"
-    #NavigationDrawerIconButton:
+    #MyNavigationDrawerIconButton:
         #icon: 'archive'
         #text: "Archieve"
         #on_release: app.root.ids.scr_mngr.current = 'archieve'
         #badge_text: "0"
-    #NavigationDrawerIconButton:
+    #MyNavigationDrawerIconButton:
         #icon: 'email-open-outline'
         #text: "Spam"
         #on_release: app.root.ids.scr_mngr.current = 'spam'
         #badge_text: "0"
-    NavigationDrawerIconButton:
+    MyNavigationDrawerIconButton:
         id: trash_cnt
         icon: 'delete'
         text: "Trash"
         on_release: app.root.ids.scr_mngr.current = 'trash'
         badge_text: "0"
-    NavigationDrawerIconButton:
+    MyNavigationDrawerIconButton:
         id: allmail_cnt
         text: "All Mails"
         icon:'contact-mail'
@@ -107,31 +109,31 @@
     NavigationDrawerDivider:
     NavigationDrawerSubheader:
         text: "All labels"
-    NavigationDrawerIconButton: 
+    MyNavigationDrawerIconButton:
         text: "Address Book"
         icon:'book-multiple'
         on_release: app.root.ids.scr_mngr.current = 'addressbook' 
-    NavigationDrawerIconButton: 
+    MyNavigationDrawerIconButton:
         text: "Settings"
         icon:'settings'
         on_release: app.root.ids.scr_mngr.current = 'set'
-    NavigationDrawerIconButton: 
+    MyNavigationDrawerIconButton:
         text: "Subscriptions/Payment"
         icon:'bell'
         on_release: app.root.ids.scr_mngr.current = 'payment'
-    NavigationDrawerIconButton: 
+    MyNavigationDrawerIconButton:
         text: "Credits"
         icon:'wallet'
         on_release: app.root.ids.scr_mngr.current = 'credits'
-    NavigationDrawerIconButton: 
+    MyNavigationDrawerIconButton:
         text: "new address"
         icon:'account-plus'
         on_release: app.root.ids.scr_mngr.current = 'login'
-    NavigationDrawerIconButton: 
+    MyNavigationDrawerIconButton:
         text: "Network Status"
         icon:'server-network'
         on_release: app.root.ids.scr_mngr.current = 'networkstat'
-    NavigationDrawerIconButton: 
+    MyNavigationDrawerIconButton:
         text: "My Addresses"
         icon:'account-multiple'
         on_release: app.root.ids.scr_mngr.current = 'myaddress'
@@ -545,12 +547,6 @@ NavigationLayout:
                             color: (1,1,1,1)
                             halign: 'center'
 
-<AddressSuccessful>:
-    name: 'add_sucess'
-    Label:
-        text: 'Successfully created a new bit address'
-        color: 0,0,0,1
-
 <Setting>:
     name: 'set'
     ScrollView:
diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py
index bab578de..22474819 100644
--- a/src/bitmessagekivy/mpybit.py
+++ b/src/bitmessagekivy/mpybit.py
@@ -45,7 +45,8 @@ from kivymd.uix.list import (
     ILeftBodyTouch,
     IRightBodyTouch,
     TwoLineAvatarIconListItem,
-    TwoLineListItem
+    TwoLineListItem,
+    OneLineIconListItem
 )
 from kivymd.uix.navigationdrawer import (
     MDNavigationDrawer,
@@ -873,12 +874,6 @@ class Random(Screen):
         self.ids.label.text = ''
 
 
-class AddressSuccessful(Screen):
-    """Getting Address Detail."""
-
-    pass
-
-
 class Sent(Screen):
     """Sent Screen uses screen to show widgets of screens"""
     queryreturn = ListProperty()
@@ -1439,8 +1434,8 @@ class NavigateApp(App):  # pylint: disable=too-many-public-methods
             self.root.ids.scr_mngr.transition.direction = 'right'
             self.root.ids.scr_mngr.transition.bind(on_complete=self.reset)
             return True
-        elif key == 13:
-            if state.search_screen == 'inbox' and state.searcing_text:
+        elif key == 13 and state.searcing_text:
+            if state.search_screen == 'inbox':
                 self.root.ids.sc1.children[1].active = True
                 Clock.schedule_once(self.search_callback, 0.5)
             elif state.search_screen == 'addressbook':
@@ -1930,7 +1925,7 @@ class MailDetail(Screen):
         elif state.detailPageType == 'inbox':
             data = sqlQuery(
                 "select toaddress, fromaddress, subject, message from inbox"
-                " where msgid = ?;", str(state.mail_id))
+                " where msgid = ?;", state.mail_id)
             self.assign_mail_details(data)
             state.kivyapp.set_mail_detail_header()
 
@@ -2589,3 +2584,8 @@ class LoadingPopup(Popup):
     def dismiss_popup(self, dt):
         """Dismiss popups"""
         self.dismiss()
+
+
+class AddressDropdown(OneLineIconListItem):
+    """AddressDropdown showns all the addresses"""
+    pass
\ No newline at end of file