diff --git a/enzevalos_iphone/FolderViewController.swift b/enzevalos_iphone/FolderViewController.swift
index ac0e659c2ea469c677c3d5e48ac415dc3b241a03..c62c58dbcae260acbfe904ce74e0e7febfbdab4d 100644
--- a/enzevalos_iphone/FolderViewController.swift
+++ b/enzevalos_iphone/FolderViewController.swift
@@ -202,7 +202,12 @@ class FolderViewController: UITableViewController {
                 performSegue(withIdentifier: "showInboxSegue", sender: nil)
             }
         } else if sectionType(indexPath) == .mails {
-            performSegue(withIdentifier: "readFolderMailSegue", sender: getMails()[indexPath.row])
+            let mail = getMails()[indexPath.row]
+            if AppDelegate.getAppDelegate().newReadView, let coord = AppDelegate.getAppDelegate().readViewCoordinator {
+                               coord.pushReadView(mail: mail)
+                               return
+                           }
+            performSegue(withIdentifier: "readFolderMailSegue", sender: mail)
         } else {
             let vc = storyboard?.instantiateViewController(withIdentifier: "folderViewController") as! FolderViewController
             vc.folders = []
diff --git a/enzevalos_iphone/KeyViewController.swift b/enzevalos_iphone/KeyViewController.swift
index b789c2270ff7965989c681731aa1dbca3ec93b9a..f4301b2df9d1909b1e98ffb9738ff71d2cd2534c 100644
--- a/enzevalos_iphone/KeyViewController.swift
+++ b/enzevalos_iphone/KeyViewController.swift
@@ -316,6 +316,10 @@ extension KeyViewController: UITableViewDataSource {
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         if segue.identifier == "firstMail" {
             if let mail = record?.key?.firstMail {
+                if AppDelegate.getAppDelegate().newReadView, let coord = AppDelegate.getAppDelegate().readViewCoordinator {
+                                   coord.pushReadView(mail: mail)
+                                   return
+                               }
                 let DestinationViewController: ReadViewController = segue.destination as! ReadViewController
                 DestinationViewController.mail = mail
             }
diff --git a/enzevalos_iphone/ListViewController.swift b/enzevalos_iphone/ListViewController.swift
index 4983b0bc098a3e6d61171e0dd6cf266aeadd719c..f77dd228382854c050c54ad0981e2597318f060a 100644
--- a/enzevalos_iphone/ListViewController.swift
+++ b/enzevalos_iphone/ListViewController.swift
@@ -242,6 +242,10 @@ class ListViewController: UITableViewController {
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         if segue.identifier == "readMailSegue" {
             if let mail = sender as? PersistentMail {
+                if AppDelegate.getAppDelegate().newReadView, let coord = AppDelegate.getAppDelegate().readViewCoordinator {
+                    coord.pushReadView(mail: mail)
+                    return
+                }
                 let DestinationViewController: ReadViewController = segue.destination as! ReadViewController
                 DestinationViewController.mail = mail
             }