fix rebase error, add missing DC_GCL_FOR_FORWARDING flag

deltachat-ios/AppDelegate.swift

@@ -82,9 +82,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         // setup deltachat core context
         //       - second param remains nil (user data for more than one mailbox)
         open()
+        RelayHelper.setup(dcContext)
         appCoordinator = AppCoordinator(window: window, dcContext: dcContext)
         appCoordinator.start()
-        RelayHelper.setup(dcContext)
         locationManager = LocationManager(context: dcContext)
         UIApplication.shared.setMinimumBackgroundFetchInterval(UIApplication.backgroundFetchIntervalMinimum)
         start()

deltachat-ios/ViewModel/ChatListViewModel.swift

@@ -91,6 +91,8 @@ class ChatListViewModel: NSObject, ChatListViewModelProtocol {
         var gclFlags: Int32 = 0
         if isArchive {
             gclFlags |= DC_GCL_ARCHIVED_ONLY
+        } else if RelayHelper.sharedInstance.isForwarding() {
+            gclFlags |= DC_GCL_FOR_FORWARDING
         }
         self.chatList = dcContext.getChatlist(flags: gclFlags, queryString: nil, queryId: 0)
         if notifyListener {