diff --git a/enzevalos_iphone/FolderViewController.swift b/enzevalos_iphone/FolderViewController.swift
index bde8ef9ece36163530f0b5148156412ce3130abe..3d05cf5483082c1c4215809862c1f1c42bc9b8d3 100644
--- a/enzevalos_iphone/FolderViewController.swift
+++ b/enzevalos_iphone/FolderViewController.swift
@@ -85,9 +85,15 @@ class FolderViewController: UITableViewController {
     }
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
+        navigationController?.isToolbarHidden = false
 
         tableView.reloadData()
     }
+    
+    override func viewWillDisappear(_ animated: Bool){
+        navigationController?.isToolbarHidden = true
+    }
+    
     override func numberOfSections(in tableView: UITableView) -> Int {
         var count = 0
 
@@ -190,7 +196,12 @@ class FolderViewController: UITableViewController {
 
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if sectionType(indexPath) == .inbox {
-            performSegue(withIdentifier: "showInboxSegue", sender: nil)
+            if let coord = AppDelegate.getAppDelegate().inboxCoordinator {
+                coord.pushInbox()
+            } else {
+                // If new inbox is not available...
+                performSegue(withIdentifier: "showInboxSegue", sender: nil)
+            }
         } else if sectionType(indexPath) == .mails {
             performSegue(withIdentifier: "readFolderMailSegue", sender: getMails()[indexPath.row])
         } else {
diff --git a/enzevalos_iphone/KeyRecord+CoreDataProperties.swift b/enzevalos_iphone/KeyRecord+CoreDataProperties.swift
index c967a9099fbf57e8ef4fc4e3b9428baee547fea0..c2166ee2452294ea492434b3dfd39ece063832c2 100644
--- a/enzevalos_iphone/KeyRecord+CoreDataProperties.swift
+++ b/enzevalos_iphone/KeyRecord+CoreDataProperties.swift
@@ -90,6 +90,3 @@ extension KeyRecord {
         return request
     }
 }
-
-
-
diff --git a/enzevalos_iphone/MailHandler.swift b/enzevalos_iphone/MailHandler.swift
index 3c03e32dfeffee3a0f652b99ac6152f9e712f235..d900c05cf08d968cc93a4bad00771865eea86b0b 100644
--- a/enzevalos_iphone/MailHandler.swift
+++ b/enzevalos_iphone/MailHandler.swift
@@ -985,6 +985,7 @@ class MailHandler {
             completionCallback(MailServerConnectionError.NoData)
             return
         }
+        folder.lastUpdate = Date()
         if folder.mailsOfFolder.count > 0 {
             self.loadMailsByNum(folder: folder, completionCallback: completionCallback, multipleMails: false)
         } else {
diff --git a/enzevalos_iphone/Onboarding.swift b/enzevalos_iphone/Onboarding.swift
index 328db8abda14d7fd452e1e5beceba166a8ecfdf8..424775b647b184b56b9087829f60963ce4815b9a 100644
--- a/enzevalos_iphone/Onboarding.swift
+++ b/enzevalos_iphone/Onboarding.swift
@@ -27,7 +27,7 @@ class Onboarding: NSObject {
         super.init()
     }
     static var textDelegate = TextFieldDelegate.init()
-    static let defaultColor = UIColor.red
+    static let defaultColor = UIColor.darkGray
     static let textColor = UIColor.white
     static var mailaddress = UITextField.init()
     static var username = UITextField.init()
@@ -77,13 +77,7 @@ class Onboarding: NSObject {
     private static var currentIMAP: MailSession?
     private static var currentSMTP: MailSession?
     
-    
-    
     static func onboarding(_ errorCode: MailServerConnectionError? = nil) -> UIViewController {
-        
-        
-        
-        
         password.isSecureTextEntry = true
         doWhenDone = checkIMAPConfig
         startTimeView = Date()