found better approach

deltachat-ios.xcodeproj/project.pbxproj

@@ -155,7 +155,6 @@
 		AEE6EC3F2282C59C00EDC689 /* GroupMembersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEE6EC3E2282C59C00EDC689 /* GroupMembersViewController.swift */; };
 		AEE6EC412282DF5700EDC689 /* MailboxViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEE6EC402282DF5700EDC689 /* MailboxViewController.swift */; };
 		AEE6EC482283045D00EDC689 /* EditSettingsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEE6EC472283045D00EDC689 /* EditSettingsController.swift */; };
-		AEF6E8C82432449900AFC203 /* UINavigationController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEF6E8C72432449900AFC203 /* UINavigationController+Extension.swift */; };
 		AEFBE22F23FEF23D0045327A /* ProviderInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEFBE22E23FEF23D0045327A /* ProviderInfoCell.swift */; };
 		AEFBE23123FF09B20045327A /* TypeAlias.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEFBE23023FF09B20045327A /* TypeAlias.swift */; };
 		B21005DB23383664004C70C5 /* SettingsClassicViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B21005DA23383664004C70C5 /* SettingsClassicViewController.swift */; };
@@ -390,7 +389,6 @@
 		AEE6EC3E2282C59C00EDC689 /* GroupMembersViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupMembersViewController.swift; sourceTree = "<group>"; };
 		AEE6EC402282DF5700EDC689 /* MailboxViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailboxViewController.swift; sourceTree = "<group>"; };
 		AEE6EC472283045D00EDC689 /* EditSettingsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditSettingsController.swift; sourceTree = "<group>"; };
-		AEF6E8C72432449900AFC203 /* UINavigationController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UINavigationController+Extension.swift"; sourceTree = "<group>"; };
 		AEFBE22E23FEF23D0045327A /* ProviderInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProviderInfoCell.swift; sourceTree = "<group>"; };
 		AEFBE23023FF09B20045327A /* TypeAlias.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeAlias.swift; sourceTree = "<group>"; };
 		B21005DA23383664004C70C5 /* SettingsClassicViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsClassicViewController.swift; sourceTree = "<group>"; };
@@ -479,7 +477,6 @@
 				3059620D234614E700C80F33 /* DcContact+Extension.swift */,
 				3059620F2346154D00C80F33 /* String+Extension.swift */,
 				302B84CD2397F6CD001C261F /* URL+Extension.swift */,
-				AEF6E8C72432449900AFC203 /* UINavigationController+Extension.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -1167,7 +1164,6 @@
 				30A4D9AE2332672700544344 /* QrInviteViewController.swift in Sources */,
 				305961D62346125100C80F33 /* MessageInputBar.swift in Sources */,
 				305961ED2346125100C80F33 /* DetectorType.swift in Sources */,
-				AEF6E8C82432449900AFC203 /* UINavigationController+Extension.swift in Sources */,
 				305962062346125100C80F33 /* TypingIndicatorCellSizeCalculator.swift in Sources */,
 				AE851AC7227C776400ED86F0 /* Location.swift in Sources */,
 				7AE0A5491FC42F65005ECB4B /* NewChatViewController.swift in Sources */,

deltachat-ios/Controller/ChatViewController.swift

@@ -45,6 +45,8 @@ class ChatViewController: MessagesViewController {
     let outgoingAvatarOverlap: CGFloat = 17.5
     let loadCount = 30
 
+    private var searchedMsgId: Int?
+
     let chatId: Int
     let refreshControl = UIRefreshControl()
     var messageList: [DcMsg] = []
@@ -80,7 +82,7 @@ class ChatViewController: MessagesViewController {
         return messageInputBar
     }
 
-    init(dcContext: DcContext, chatId: Int) {
+    init(dcContext: DcContext, chatId: Int, searchedMsgId: Int? = nil) {
         let dcChat = DcChat(id: chatId)
         self.dcContext = dcContext
         self.chatId = chatId
@@ -88,6 +90,7 @@ class ChatViewController: MessagesViewController {
         self.showNamesAboveMessage = dcChat.isGroup
         super.init(nibName: nil, bundle: nil)
         hidesBottomBarWhenPushed = true
+        self.searchedMsgId = searchedMsgId
     }
 
     required init?(coder _: NSCoder) {
@@ -316,7 +319,12 @@ class ChatViewController: MessagesViewController {
                 self.messageList = self.getMessageIds(self.loadCount)
                 self.messagesCollectionView.reloadData()
                 self.refreshControl.endRefreshing()
-                self.messagesCollectionView.scrollToBottom(animated: false)
+                if let msgId = self.searchedMsgId {
+                    self.scrollToMessage(id: msgId, animated: false)
+                    self.searchedMsgId = nil
+                } else {
+                    self.messagesCollectionView.scrollToBottom(animated: false)
+                }
                 self.showEmptyStateView(self.messageList.isEmpty)
             }
         }

deltachat-ios/Controller/MailboxViewController.swift

@@ -2,7 +2,7 @@ import UIKit
 
 class MailboxViewController: ChatViewController {
 
-    override init(dcContext: DcContext, chatId: Int) {
+    override init(dcContext: DcContext, chatId: Int, searchedMsgId: Int? = nil) {
         super.init(dcContext: dcContext, chatId: chatId)
         hidesBottomBarWhenPushed = true
         showCustomNavBar = false

deltachat-ios/Coordinator/AppCoordinator.swift

@@ -186,16 +186,12 @@ class ChatListCoordinator: Coordinator {
     }
 
     func showChat(chatId: Int, msgId: Int? = nil) {
-        let chatVC = ChatViewController(dcContext: dcContext, chatId: chatId)
+        let chatVC = ChatViewController(dcContext: dcContext, chatId: chatId, searchedMsgId: msgId)
         let coordinator = ChatViewCoordinator(dcContext: dcContext, navigationController: navigationController, chatId: chatId)
         childCoordinators.append(coordinator)
         chatVC.coordinator = coordinator
 
-        navigationController.pushViewController(chatVC, animated: true, completion: {
-            if let msgId = msgId {
-                chatVC.scrollToMessage(id: msgId, animated: true)
-            }
-        })
+        navigationController.pushViewController(chatVC, animated: true)
     }
 
     func showArchive() {

deltachat-ios/Extensions/UINavigationController+Extension.swift

@@ -1,30 +0,0 @@
-import UIKit
-
-extension UINavigationController {
-    public func pushViewController(
-        _ viewController: UIViewController,
-        animated: Bool,
-        completion: @escaping () -> Void) {
-        pushViewController(viewController, animated: animated)
-
-        guard animated, let coordinator = transitionCoordinator else {
-            DispatchQueue.main.async { completion() }
-            return
-        }
-
-        coordinator.animate(alongsideTransition: nil) { _ in completion() }
-    }
-
-    func popViewController(
-        animated: Bool,
-        completion: @escaping () -> Void) {
-        popViewController(animated: animated)
-
-        guard animated, let coordinator = transitionCoordinator else {
-            DispatchQueue.main.async { completion() }
-            return
-        }
-
-        coordinator.animate(alongsideTransition: nil) { _ in completion() }
-    }
-}