diff --git a/Podfile.lock b/Podfile.lock
index 916398c32ab248f00e5b30069cc6a1f86083d489..e7fb006cfc9034a0185949ebe434a5bf207d1351 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -27,4 +27,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 4991d462e1331cd4544d402d5e14432ef470f0f9
 
-COCOAPODS: 1.0.1
+COCOAPODS: 1.1.1
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
index 916398c32ab248f00e5b30069cc6a1f86083d489..e7fb006cfc9034a0185949ebe434a5bf207d1351 100644
--- a/Pods/Manifest.lock
+++ b/Pods/Manifest.lock
@@ -27,4 +27,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 4991d462e1331cd4544d402d5e14432ef470f0f9
 
-COCOAPODS: 1.0.1
+COCOAPODS: 1.1.1
diff --git a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate
index e09a21e616668682703aebadb1f75bd584859696..cf87101bc90a063d69493b881fe14ca22e9367c4 100644
Binary files a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate and b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index bae0639c35909943d4a0b1652c14b9f93d75651d..cce3781ba85fda4b9c5506d29ee5f04ba1c77365 100644
--- a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -136,11 +136,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/Mail+CoreDataClass.swift"
-            timestampString = "506264813.907778"
+            timestampString = "510080743.615576"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "190"
-            endingLineNumber = "190"
+            startingLineNumber = "165"
+            endingLineNumber = "165"
             landmarkName = "getSubjectWithFlagsString()"
             landmarkType = "7">
          </BreakpointContent>
@@ -152,7 +152,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/Mail+CoreDataClass.swift"
-            timestampString = "506264813.907778"
+            timestampString = "509968354.815164"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "76"
@@ -173,8 +173,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "24"
             endingLineNumber = "24"
-            landmarkName = "tableView(tableView:numberOfRowsInSection:)"
-            landmarkType = "7">
+            landmarkName = "ListViewController"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -189,7 +189,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "40"
             endingLineNumber = "40"
-            landmarkName = "tableView(tableView:cellForRowAtIndexPath:)"
+            landmarkName = "filterContentForSearchText(searchText:scope:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -232,7 +232,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/Mail+CoreDataClass.swift"
-            timestampString = "506264813.907778"
+            timestampString = "509968354.815164"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "44"
@@ -264,12 +264,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/SendViewController.swift"
-            timestampString = "505223267.753227"
+            timestampString = "509988292.363633"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "480"
-            endingLineNumber = "480"
-            landmarkName = "iconButton(sender:)"
+            startingLineNumber = "461"
+            endingLineNumber = "461"
+            landmarkName = "keyboardClose(notification:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -328,11 +328,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/KeyRecord.swift"
-            timestampString = "508861868.665447"
+            timestampString = "510573813.103231"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "219"
-            endingLineNumber = "219">
+            startingLineNumber = "270"
+            endingLineNumber = "270">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -342,11 +342,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/KeyRecord.swift"
-            timestampString = "508861868.665447"
+            timestampString = "510573813.103231"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "128"
-            endingLineNumber = "128"
+            startingLineNumber = "179"
+            endingLineNumber = "179"
             landmarkName = "addNewMail(_:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -363,8 +363,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "71"
             endingLineNumber = "71"
-            landmarkName = "InboxTableViewCell"
-            landmarkType = "3">
+            landmarkName = "layoutSubviews()"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -411,8 +411,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "72"
             endingLineNumber = "72"
-            landmarkName = "InboxTableViewCell"
-            landmarkType = "3">
+            landmarkName = "layoutSubviews()"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -470,11 +470,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/EnzevalosContact+CoreDataClass.swift"
-            timestampString = "507140419.705835"
+            timestampString = "510572484.538767"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "31"
-            endingLineNumber = "31"
+            startingLineNumber = "40"
+            endingLineNumber = "40"
             landmarkName = "EnzevalosContact"
             landmarkType = "3">
          </BreakpointContent>
@@ -550,11 +550,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/EnzevalosContact+CoreDataClass.swift"
-            timestampString = "507140419.705835"
+            timestampString = "510572484.538767"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "172"
-            endingLineNumber = "172">
+            startingLineNumber = "181"
+            endingLineNumber = "181">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -612,11 +612,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "506370997.543682"
+            timestampString = "509969467.861654"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "488"
-            endingLineNumber = "488">
+            startingLineNumber = "477"
+            endingLineNumber = "477">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -626,11 +626,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "506370997.543682"
+            timestampString = "509969467.861654"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "572"
-            endingLineNumber = "572">
+            startingLineNumber = "561"
+            endingLineNumber = "561">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -640,12 +640,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "508352046.915824"
+            timestampString = "510572484.538767"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "345"
-            endingLineNumber = "345"
-            landmarkName = "createMail(_:sender:receivers:cc:time:received:subject:body:flags:)"
+            startingLineNumber = "338"
+            endingLineNumber = "338"
+            landmarkName = "createMail(uid:sender:receivers:cc:time:received:subject:body:flags:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -656,11 +656,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "508861868.665447"
+            timestampString = "510572888.224144"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "455"
-            endingLineNumber = "455">
+            startingLineNumber = "446"
+            endingLineNumber = "446">
             <Locations>
                <Location
                   shouldBeEnabled = "No"
@@ -702,11 +702,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
-            timestampString = "506370956.214616"
+            timestampString = "509969467.861654"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "373"
-            endingLineNumber = "373">
+            startingLineNumber = "362"
+            endingLineNumber = "362">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -716,11 +716,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/EnzevalosContact+CoreDataClass.swift"
-            timestampString = "506524999.787764"
+            timestampString = "510572484.538767"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "22"
-            endingLineNumber = "22"
+            startingLineNumber = "20"
+            endingLineNumber = "20"
             landmarkName = "EnzevalosContact"
             landmarkType = "3">
          </BreakpointContent>
@@ -780,12 +780,188 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
-            timestampString = "508861868.665447"
+            timestampString = "510572484.538767"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "410"
+            endingLineNumber = "410"
+            landmarkName = "isInRecords(m:records:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/Mail+CoreDataClass.swift"
+            timestampString = "509968354.815164"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "108"
+            endingLineNumber = "108"
+            landmarkName = "decryptIfPossible()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
+            timestampString = "510569903.586738"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "147"
+            endingLineNumber = "147"
+            landmarkName = "decryptAndSignatureCheck(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
+            timestampString = "509969565.080978"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "126"
+            endingLineNumber = "126"
+            landmarkName = "decryptAndSignatureCheck(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/KeyRecord.swift"
+            timestampString = "510573813.103231"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "152"
+            endingLineNumber = "152"
+            landmarkName = "addNewMail(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/KeyRecord.swift"
+            timestampString = "510573813.103231"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "151"
+            endingLineNumber = "151"
+            landmarkName = "addNewMail(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
+            timestampString = "510572484.538767"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "25"
+            endingLineNumber = "25"
+            landmarkName = "DataHandler"
+            landmarkType = "3">
+            <Locations>
+               <Location
+                  shouldBeEnabled = "No"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "enzevalos_iphone.DataHandler.receiverRecords.getter : Swift.Array&lt;enzevalos_iphone.KeyRecord&gt;"
+                  moduleName = "enzevalos_iphone"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/Olli/enzevalos/enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
+                  timestampString = "510507592.300039"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "31"
+                  endingLineNumber = "31"
+                  offsetFromSymbolStart = "25">
+               </Location>
+               <Location
+                  shouldBeEnabled = "No"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "enzevalos_iphone.DataHandler.receiverRecords.setter : Swift.Array&lt;enzevalos_iphone.KeyRecord&gt;"
+                  moduleName = "enzevalos_iphone"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/Olli/enzevalos/enzevalos_iphone/enzevalos_iphone/DataHandler.swift"
+                  timestampString = "510507592.301441"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "31"
+                  endingLineNumber = "31"
+                  offsetFromSymbolStart = "54">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/ContactViewController.swift"
+            timestampString = "510572484.538767"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "137"
+            endingLineNumber = "137"
+            landmarkName = "tableView(_:numberOfRowsInSection:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/ContactViewController.swift"
+            timestampString = "510572888.224144"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "138"
+            endingLineNumber = "138"
+            landmarkName = "tableView(_:numberOfRowsInSection:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../enzevalos_iphone/enzevalos_iphone/ContactViewController.swift"
+            timestampString = "510572484.538767"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "419"
-            endingLineNumber = "419"
-            landmarkName = "getRecords()"
+            startingLineNumber = "124"
+            endingLineNumber = "124"
+            landmarkName = "tableView(_:numberOfRowsInSection:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>