diff --git a/enzevalos_iphone/SwiftUI/Contact/ContactView.swift b/enzevalos_iphone/SwiftUI/Contact/ContactView.swift
index 9aa96309808f79e4bab044a93d4a4d7cb4d51988..aba0935a46e7feef5a54f9c86071afe5dfcb191c 100644
--- a/enzevalos_iphone/SwiftUI/Contact/ContactView.swift
+++ b/enzevalos_iphone/SwiftUI/Contact/ContactView.swift
@@ -15,10 +15,6 @@ struct ContactView <C: DisplayContact, M: DisplayMail>: View {
     public var fromMail: M?
     public var derivedFromKey: Bool = true
     
-//    init(contact: C, fromMail: M? = nil) {
-//        self.contact = contact
-//    }
-    
     var body: some View {
         TabView{
             ForEach(Tabs, id: \.id ){ tab in
diff --git a/enzevalos_iphone/SwiftUI/Inbox/MailListView.swift b/enzevalos_iphone/SwiftUI/Inbox/MailListView.swift
index c88f1a300a349ffa3bbebd9ecb8b1ad9b8d63cf5..a6abf0237ae3a968529a1878cdf479872af72adf 100644
--- a/enzevalos_iphone/SwiftUI/Inbox/MailListView.swift
+++ b/enzevalos_iphone/SwiftUI/Inbox/MailListView.swift
@@ -51,6 +51,7 @@ struct MailListView: View {
                 .padding(-10)
             // Toolbar
             HStack {
+                self.idButton
                 Spacer()
                 self.lastUpdate
                 Spacer()
@@ -70,6 +71,12 @@ struct MailListView: View {
         .resignKeyboardOnDragGesture() // hide keyboard when dragging
     }
 
+    private var idButton: some View {
+        Button(action: { print("Go to my id") }) {
+            Text(NSLocalizedString("KeyID", comment: "id"))
+        }
+    }
+
     private var composeButton: some View {
         Button(action: {
             composeMail = true
@@ -115,14 +122,11 @@ struct MailListView: View {
         let query = self.searchText.lowercased()
         if (searchType == .All || searchType == .Sender) && (containsSearchTerms(content: keyRecord.sender.displayname, searchText: query) || containsSearchTerms(content: keyRecord.sender.email, searchText: query)) {
             return true
-        }
-        else if (searchType == .All || searchType == .Sender) && keyRecord.addresses.filter({containsSearchTerms(content: $0.email, searchText: query)}).count > 0 {
+        } else if (searchType == .All || searchType == .Sender) && keyRecord.addresses.filter({containsSearchTerms(content: $0.email, searchText: query)}).count > 0 {
             return true
-        }
-        else if (searchType == .All || searchType == .Subject) && containsSearchTerms(content: keyRecord.subject, searchText: query){
+        } else if (searchType == .All || searchType == .Subject) && containsSearchTerms(content: keyRecord.subject, searchText: query){
             return true
-        }
-        else if (searchType == .All || searchType == .Body) && containsSearchTerms(content: keyRecord.body, searchText: query){
+        } else if (searchType == .All || searchType == .Body) && containsSearchTerms(content: keyRecord.body, searchText: query){
             return true
         }
         return false