initial message kit replacement commit

DcCore/DcCore/DC/Wrapper.swift

@@ -27,14 +27,19 @@ public class DcContext {
         return .dcContext
     }
 
-    public func getMessageIds(chatId: Int, count: Int, from: Int?) -> [Int] {
+    public func getMessageIds(chatId: Int, count: Int? = nil, from: Int? = nil) -> [Int] {
 		let cMessageIds = getChatMessages(chatId: chatId)
 
+
         let ids: [Int]
         if let from = from {
+            // skip last part
             ids = DcUtils.copyAndFreeArrayWithOffset(inputArray: cMessageIds, len: count, skipEnd: from)
-        } else {
+        } else if let count = count {
+            // skip first part
             ids = DcUtils.copyAndFreeArrayWithLen(inputArray: cMessageIds, len: count)
+        } else {
+            ids = DcUtils.copyAndFreeArrayWithLen(inputArray: cMessageIds)
         }
         return ids
     }

DcCore/DcCore/Helper/DcUtils.swift

@@ -54,6 +54,19 @@ public struct DcUtils {
         return acc
     }
 
+
+    static func copyAndFreeArrayWithLen(inputArray: OpaquePointer?) -> [Int] {
+        var acc: [Int] = []
+        let arrayLen = dc_array_get_cnt(inputArray)
+        for i in 0 ..< arrayLen {
+            let e = dc_array_get_id(inputArray, i)
+            acc.append(Int(e))
+        }
+        dc_array_unref(inputArray)
+
+        return acc
+    }
+
     static func copyAndFreeArrayWithLen(inputArray: OpaquePointer?, len: Int = 0) -> [Int] {
         var acc: [Int] = []
         let arrayLen = dc_array_get_cnt(inputArray)
@@ -67,16 +80,17 @@ public struct DcUtils {
         return acc
     }
 
-    static func copyAndFreeArrayWithOffset(inputArray: OpaquePointer?, len: Int = 0, from: Int = 0, skipEnd: Int = 0) -> [Int] {
+    static func copyAndFreeArrayWithOffset(inputArray: OpaquePointer?, len: Int? = 0, from: Int = 0, skipEnd: Int = 0) -> [Int] {
         let lenArray = dc_array_get_cnt(inputArray)
+        let length = len ?? lenArray
         if lenArray <= skipEnd || lenArray == 0 {
             dc_array_unref(inputArray)
             return []
         }
 
         let start = lenArray - 1 - skipEnd
-        let end = max(0, start - len)
-        let finalLen = start - end + (len > 0 ? 0 : 1)
+        let end = max(0, start - length)
+        let finalLen = start - end + (length > 0 ? 0 : 1)
         var acc: [Int] = [Int](repeating: 0, count: finalLen)
 
         for i in stride(from: start, to: end, by: -1) {
@@ -85,7 +99,7 @@ public struct DcUtils {
         }
 
         dc_array_unref(inputArray)
-        DcContext.shared.logger?.info("got: \(from) \(len) \(lenArray) - \(acc)")
+        DcContext.shared.logger?.info("got: \(from) \(length) \(lenArray) - \(acc)")
 
         return acc
     }

deltachat-ios.xcodeproj/project.pbxproj

@@ -117,6 +117,8 @@
 		30E8F2512449EA0E00CE2C90 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3060119E22DDE24000C1CE6F /* Localizable.strings */; };
 		30E8F253244DAD0E00CE2C90 /* SendingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E8F252244DAD0E00CE2C90 /* SendingController.swift */; };
 		30F9B9EC235F2116006E7ACF /* MessageCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30F9B9EB235F2116006E7ACF /* MessageCounter.swift */; };
+		30FDB70524D1C1000066C48D /* ChatViewControllerNew.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30FDB6F824D1C1000066C48D /* ChatViewControllerNew.swift */; };
+		30FDB71F24D8170E0066C48D /* NewTextMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30FDB71E24D8170E0066C48D /* NewTextMessageCell.swift */; };
 		451CF971F08D38BCECADCB45 /* Pods_deltachat_ios_DcShare.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 546063D4BFB8FD920C4EAA22 /* Pods_deltachat_ios_DcShare.framework */; };
 		6795F63A82E94FF7CD2CEC0F /* Pods_deltachat_iosTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F7009234DB9408201A6CDCB /* Pods_deltachat_iosTests.framework */; };
 		7070FB9B2101ECBB000DC258 /* NewGroupController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7070FB9A2101ECBB000DC258 /* NewGroupController.swift */; };
@@ -401,6 +403,8 @@
 		30E8F2432449C64100CE2C90 /* ChatListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatListCell.swift; sourceTree = "<group>"; };
 		30E8F252244DAD0E00CE2C90 /* SendingController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendingController.swift; sourceTree = "<group>"; };
 		30F9B9EB235F2116006E7ACF /* MessageCounter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageCounter.swift; sourceTree = "<group>"; };
+		30FDB6F824D1C1000066C48D /* ChatViewControllerNew.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatViewControllerNew.swift; sourceTree = "<group>"; };
+		30FDB71E24D8170E0066C48D /* NewTextMessageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTextMessageCell.swift; sourceTree = "<group>"; };
 		546063D4BFB8FD920C4EAA22 /* Pods_deltachat_ios_DcShare.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_deltachat_ios_DcShare.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		6241BE1534A653E79AD5D01D /* Pods_deltachat_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_deltachat_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		7070FB9A2101ECBB000DC258 /* NewGroupController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewGroupController.swift; sourceTree = "<group>"; };
@@ -767,6 +771,31 @@
 			path = DcShare;
 			sourceTree = "<group>";
 		};
+		30FDB6B224D18E390066C48D /* Chat */ = {
+			isa = PBXGroup;
+			children = (
+				30FDB6F824D1C1000066C48D /* ChatViewControllerNew.swift */,
+				30FDB6B524D193DD0066C48D /* Views */,
+			);
+			path = Chat;
+			sourceTree = "<group>";
+		};
+		30FDB6B524D193DD0066C48D /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				30FDB6B624D193DD0066C48D /* Cells */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
+		30FDB6B624D193DD0066C48D /* Cells */ = {
+			isa = PBXGroup;
+			children = (
+				30FDB71E24D8170E0066C48D /* NewTextMessageCell.swift */,
+			);
+			path = Cells;
+			sourceTree = "<group>";
+		};
 		7A9FB1371FB061E2001FEA36 = {
 			isa = PBXGroup;
 			children = (
@@ -808,6 +837,7 @@
 				7A9FB1431FB061E2001FEA36 /* AppDelegate.swift */,
 				AE851AC3227C695900ED86F0 /* View */,
 				AE851AC2227C695000ED86F0 /* Helper */,
+				30FDB6B224D18E390066C48D /* Chat */,
 				AE851AC1227C694300ED86F0 /* Coordinator */,
 				AE851AC0227C693B00ED86F0 /* Controller */,
 				AE851ABA227C692600ED86F0 /* Model */,
@@ -1397,6 +1427,7 @@
 				30A2EC36247D72720024ADD8 /* AnimatedImageMessageCell.swift in Sources */,
 				305962082346125100C80F33 /* MediaMessageSizeCalculator.swift in Sources */,
 				AE6EC5282497B9B200A400E4 /* ThumbnailCache.swift in Sources */,
+				30FDB70524D1C1000066C48D /* ChatViewControllerNew.swift in Sources */,
 				3057029D24C6442800D84EFC /* FlexLabel.swift in Sources */,
 				AE52EA20229EB9F000C586C9 /* EditGroupViewController.swift in Sources */,
 				AE18F294228C602A0007B1BE /* SecuritySettingsController.swift in Sources */,
@@ -1471,6 +1502,7 @@
 				300C509D234B551900F8AE22 /* TextMediaMessageCell.swift in Sources */,
 				305961E92346125100C80F33 /* MessageKind.swift in Sources */,
 				305962022346125100C80F33 /* BubbleCircle.swift in Sources */,
+				30FDB71F24D8170E0066C48D /* NewTextMessageCell.swift in Sources */,
 				AE1988A523EB2FBA00B4CD5F /* Errors.swift in Sources */,
 				305961DD2346125100C80F33 /* SenderType.swift in Sources */,
 				305961E32346125100C80F33 /* MessagesDataSource.swift in Sources */,

deltachat-ios/Chat/ChatViewControllerNew.swift

@@ -0,0 +1,954 @@
+import MapKit
+import QuickLook
+import UIKit
+import InputBarAccessoryView
+import AVFoundation
+import DcCore
+import SDWebImage
+
+class ChatViewControllerNew: UITableViewController {
+    var dcContext: DcContext
+    let outgoingAvatarOverlap: CGFloat = 17.5
+    let loadCount = 30
+    let chatId: Int
+    var messageIds: [Int] = []
+
+    var msgChangedObserver: Any?
+    var incomingMsgObserver: Any?
+    var ephemeralTimerModifiedObserver: Any?
+
+    /// The `InputBarAccessoryView` used as the `inputAccessoryView` in the view controller.
+    open var messageInputBar = InputBarAccessoryView()
+    override var inputAccessoryView: UIView? {
+        if disableWriting {
+            return nil
+        }
+        return messageInputBar
+    }
+
+    open override var shouldAutorotate: Bool {
+        return false
+    }
+
+    private weak var timer: Timer?
+
+    lazy var navBarTap: UITapGestureRecognizer = {
+        UITapGestureRecognizer(target: self, action: #selector(chatProfilePressed))
+    }()
+
+    private var locationStreamingItem: UIBarButtonItem = {
+        let indicator = LocationStreamingIndicator()
+        return UIBarButtonItem(customView: indicator)
+    }()
+
+    private lazy var muteItem: UIBarButtonItem = {
+        let imageView = UIImageView()
+        imageView.tintColor = DcColors.defaultTextColor
+        imageView.image =  #imageLiteral(resourceName: "volume_off").withRenderingMode(.alwaysTemplate)
+        imageView.translatesAutoresizingMaskIntoConstraints = false
+        imageView.heightAnchor.constraint(equalToConstant: 20).isActive = true
+        imageView.widthAnchor.constraint(equalToConstant: 20).isActive = true
+        return UIBarButtonItem(customView: imageView)
+    }()
+
+    private lazy var ephemeralMessageItem: UIBarButtonItem = {
+        let imageView = UIImageView()
+        imageView.tintColor = DcColors.defaultTextColor
+        imageView.image =  #imageLiteral(resourceName: "ephemeral_timer").withRenderingMode(.alwaysTemplate)
+        imageView.translatesAutoresizingMaskIntoConstraints = false
+        imageView.heightAnchor.constraint(equalToConstant: 20).isActive = true
+        imageView.widthAnchor.constraint(equalToConstant: 20).isActive = true
+        return UIBarButtonItem(customView: imageView)
+    }()
+
+    private lazy var badgeItem: UIBarButtonItem = {
+        let badge: InitialsBadge
+        let chat = dcContext.getChat(chatId: chatId)
+        if let image = chat.profileImage {
+            badge = InitialsBadge(image: image, size: 28, accessibilityLabel: String.localized("menu_view_profile"))
+        } else {
+            badge = InitialsBadge(
+                name: chat.name,
+                color: chat.color,
+                size: 28,
+                accessibilityLabel: String.localized("menu_view_profile")
+            )
+            badge.setLabelFont(UIFont.systemFont(ofSize: 14))
+        }
+        badge.setVerified(chat.isVerified)
+        badge.accessibilityTraits = .button
+        return UIBarButtonItem(customView: badge)
+    }()
+
+    /// The `BasicAudioController` controll the AVAudioPlayer state (play, pause, stop) and udpate audio cell UI accordingly.
+    //open lazy var audioController = BasicAudioController(messageCollectionView: messagesCollectionView)
+
+    private var disableWriting: Bool
+    private var showNamesAboveMessage: Bool
+    var showCustomNavBar = true
+
+    private lazy var mediaPicker: MediaPicker? = {
+        let mediaPicker = MediaPicker(navigationController: navigationController)
+        mediaPicker.delegate = self
+        return mediaPicker
+    }()
+
+    var emptyStateView: EmptyStateLabel = {
+        let view =  EmptyStateLabel()
+        return view
+    }()
+
+    init(dcContext: DcContext, chatId: Int) {
+        let dcChat = dcContext.getChat(chatId: chatId)
+        self.dcContext = dcContext
+        self.chatId = chatId
+        self.disableWriting = !dcChat.canSend
+        self.showNamesAboveMessage = dcChat.isGroup
+        super.init(nibName: nil, bundle: nil)
+        hidesBottomBarWhenPushed = true
+    }
+
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override func viewDidLoad() {
+
+        tableView.register(NewTextMessageCell.self, forCellReuseIdentifier: "text")
+        //messagesCollectionView.register(InfoMessageCell.self)
+        super.viewDidLoad()
+        if !dcContext.isConfigured() {
+            // TODO: display message about nothing being configured
+            return
+        }
+        //configureMessageCollectionView()
+        configureEmptyStateView()
+
+        if !disableWriting {
+            configureMessageInputBar()
+            messageInputBar.inputTextView.text = textDraft
+            messageInputBar.inputTextView.becomeFirstResponder()
+        }
+
+        //refreshControl.addTarget(self, action: #selector(loadMoreMessages), for: .valueChanged)
+
+        let notificationCenter = NotificationCenter.default
+        notificationCenter.addObserver(self,
+                                       selector: #selector(setTextDraft),
+                                       name: UIApplication.willResignActiveNotification,
+                                       object: nil)
+    }
+
+    private func startTimer() {
+        timer?.invalidate()
+        timer = Timer.scheduledTimer(withTimeInterval: 60, repeats: true) { [weak self] _ in
+            //reload table
+            DispatchQueue.main.async {
+                guard let self = self else { return }
+                self.messageIds = self.getMessageIds()
+                self.reloadDataAndKeepOffset()
+                //self.refreshControl.endRefreshing()
+            }
+        }
+    }
+
+    private func stopTimer() {
+        timer?.invalidate()
+    }
+
+    private func configureEmptyStateView() {
+        view.addSubview(emptyStateView)
+        emptyStateView.translatesAutoresizingMaskIntoConstraints = false
+        emptyStateView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 40).isActive = true
+        emptyStateView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -40).isActive = true
+        emptyStateView.centerYAnchor.constraint(equalTo: view.safeAreaLayoutGuide.centerYAnchor).isActive = true
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        // this will be removed in viewWillDisappear
+        navigationController?.navigationBar.addGestureRecognizer(navBarTap)
+
+        if showCustomNavBar {
+            updateTitle(chat: dcContext.getChat(chatId: chatId))
+        }
+
+        configureMessageMenu()
+
+        let nc = NotificationCenter.default
+        msgChangedObserver = nc.addObserver(
+            forName: dcNotificationChanged,
+            object: nil,
+            queue: OperationQueue.main
+        ) { [weak self] notification in
+            guard let self = self else { return }
+            if let ui = notification.userInfo {
+                if self.disableWriting {
+                    // always refresh, as we can't check currently
+                    self.refreshMessages()
+                } else if let id = ui["message_id"] as? Int {
+                    if id > 0 {
+                        self.updateMessage(id)
+                    } else {
+                        // change might be a deletion
+                        self.refreshMessages()
+                    }
+                }
+                if self.showCustomNavBar {
+                    self.updateTitle(chat: self.dcContext.getChat(chatId: self.chatId))
+                }
+            }
+        }
+
+        incomingMsgObserver = nc.addObserver(
+            forName: dcNotificationIncoming,
+            object: nil, queue: OperationQueue.main
+        ) { [weak self] notification in
+            guard let self = self else { return }
+            if let ui = notification.userInfo {
+                if self.chatId == ui["chat_id"] as? Int {
+                    if let id = ui["message_id"] as? Int {
+                        if id > 0 {
+                            self.insertMessage(DcMsg(id: id))
+                        }
+                    }
+                }
+            }
+        }
+
+        ephemeralTimerModifiedObserver = nc.addObserver(
+            forName: dcEphemeralTimerModified,
+            object: nil, queue: OperationQueue.main
+        ) { [weak self] _ in
+            guard let self = self else { return }
+            self.updateTitle(chat: self.dcContext.getChat(chatId: self.chatId))
+        }
+
+        loadFirstMessages()
+
+        if RelayHelper.sharedInstance.isForwarding() {
+            askToForwardMessage()
+        }
+    }
+
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        AppStateRestorer.shared.storeLastActiveChat(chatId: chatId)
+        // things that do not affect the chatview
+        // and are delayed after the view is displayed
+        dcContext.marknoticedChat(chatId: chatId)
+        let array = dcContext.getFreshMessages()
+        UIApplication.shared.applicationIconBadgeNumber = array.count
+        startTimer()
+    }
+
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+
+        // the navigationController will be used when chatDetail is pushed, so we have to remove that gestureRecognizer
+        navigationController?.navigationBar.removeGestureRecognizer(navBarTap)
+    }
+
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        AppStateRestorer.shared.resetLastActiveChat()
+        setTextDraft()
+        let nc = NotificationCenter.default
+        if let msgChangedObserver = self.msgChangedObserver {
+            nc.removeObserver(msgChangedObserver)
+        }
+        if let incomingMsgObserver = self.incomingMsgObserver {
+            nc.removeObserver(incomingMsgObserver)
+        }
+        if let ephemeralTimerModifiedObserver = self.ephemeralTimerModifiedObserver {
+            nc.removeObserver(ephemeralTimerModifiedObserver)
+        }
+        //audioController.stopAnyOngoingPlaying()
+        stopTimer()
+    }
+
+    override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+        let lastSectionVisibleBeforeTransition = self.isLastSectionVisible()
+        coordinator.animate(
+            alongsideTransition: { [weak self] _ in
+                guard let self = self else { return }
+                if self.showCustomNavBar {
+                    self.navigationItem.setRightBarButton(self.badgeItem, animated: true)
+                }
+            },
+            completion: {[weak self] _ in
+                guard let self = self else { return }
+                self.updateTitle(chat: self.dcContext.getChat(chatId: self.chatId))
+                self.reloadDataAndKeepOffset()
+                if lastSectionVisibleBeforeTransition {
+                    self.scrollToBottom(animated: false)
+                }
+            }
+        )
+        super.viewWillTransition(to: size, with: coordinator)
+    }
+
+    /// UITableView methods
+
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+
+    override func tableView(_: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return messageIds.count //viewModel.numberOfRowsIn(section: section)
+    }
+
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+
+        let id = messageIds[indexPath.row]
+        let message = DcMsg(id: id)
+
+
+        let cell = tableView.dequeueReusableCell(withIdentifier: "text", for: indexPath) as? NewTextMessageCell ?? NewTextMessageCell()
+        cell.update(msg: message)
+        return cell
+    }
+
+    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+        return "test title" //viewModel.titleForHeaderIn(section: section)
+    }
+
+
+    private func updateTitle(chat: DcChat) {
+        let titleView =  ChatTitleView()
+
+        var subtitle = "ErrSubtitle"
+        let chatContactIds = chat.contactIds
+        if chat.isGroup {
+            subtitle = String.localized(stringID: "n_members", count: chatContactIds.count)
+        } else if chatContactIds.count >= 1 {
+            if chat.isDeviceTalk {
+                subtitle = String.localized("device_talk_subtitle")
+            } else if chat.isSelfTalk {
+                subtitle = String.localized("chat_self_talk_subtitle")
+            } else {
+                subtitle = DcContact(id: chatContactIds[0]).email
+            }
+        }
+
+        titleView.updateTitleView(title: chat.name, subtitle: subtitle)
+        navigationItem.titleView = titleView
+
+        var rightBarButtonItems = [badgeItem]
+        if chat.isSendingLocations {
+            rightBarButtonItems.append(locationStreamingItem)
+        }
+        if chat.isMuted {
+            rightBarButtonItems.append(muteItem)
+        }
+
+        if dcContext.getChatEphemeralTimer(chatId: chat.id) > 0 {
+            rightBarButtonItems.append(ephemeralMessageItem)
+        }
+
+        navigationItem.rightBarButtonItems = rightBarButtonItems
+    }
+
+    public func reloadDataAndKeepOffset() {
+        // stop scrolling
+        tableView.setContentOffset(tableView.contentOffset, animated: false)
+
+        // calculate the offset and reloadData
+        let beforeContentSize = tableView.contentSize
+        tableView.reloadData()
+        tableView.layoutIfNeeded()
+        let afterContentSize = tableView.contentSize
+
+        // reset the contentOffset after data is updated
+        let newOffset = CGPoint(
+            x: tableView.contentOffset.x + (afterContentSize.width - beforeContentSize.width),
+            y: tableView.contentOffset.y + (afterContentSize.height - beforeContentSize.height))
+        tableView.setContentOffset(newOffset, animated: false)
+    }
+
+    @objc
+    private func loadMoreMessages() {
+        DispatchQueue.global(qos: .userInitiated).asyncAfter(deadline: .now() + 1) {
+            DispatchQueue.main.async { [weak self] in
+                guard let self = self else { return }
+                self.messageIds = self.getMessageIds()
+                self.reloadDataAndKeepOffset()
+                //self.refreshControl.endRefreshing()
+            }
+        }
+    }
+
+    @objc
+    private func refreshMessages() {
+        DispatchQueue.global(qos: .userInitiated).asyncAfter(deadline: .now() + 1) {
+            DispatchQueue.main.async { [weak self] in
+                guard let self = self else { return }
+                self.messageIds = self.getMessageIds()
+                self.reloadDataAndKeepOffset()
+                //self.refreshControl.endRefreshing()
+                if self.isLastSectionVisible() {
+                    self.scrollToBottom(animated: true)
+                }
+                self.showEmptyStateView(self.messageIds.isEmpty)
+            }
+        }
+    }
+
+    private func loadFirstMessages() {
+        DispatchQueue.global(qos: .userInitiated).async {
+            DispatchQueue.main.async { [weak self] in
+                guard let self = self else { return }
+                self.messageIds = self.getMessageIds()
+                self.tableView.reloadData()
+                //self.refreshControl.endRefreshing()
+                //self.messagesCollectionView.scrollToBottom(animated: false)
+                self.showEmptyStateView(self.messageIds.isEmpty)
+            }
+        }
+    }
+
+    func isLastSectionVisible() -> Bool {
+           guard !messageIds.isEmpty else { return false }
+
+            let lastIndexPath = IndexPath(item: messageIds.count - 1, section: 0)
+            return tableView.indexPathsForVisibleRows?.contains(lastIndexPath) ?? false
+       }
+
+    func scrollToBottom(animated: Bool) {
+        //self.tableView.scrollToRow(at: IndexPath(row: self.messageList.count - 1, section: 0), at: .bottom, animated: animated)
+    }
+
+    private func showEmptyStateView(_ show: Bool) {
+        if show {
+            let dcChat = dcContext.getChat(chatId: chatId)
+            if chatId == DC_CHAT_ID_DEADDROP {
+                if dcContext.showEmails != DC_SHOW_EMAILS_ALL {
+                    emptyStateView.text = String.localized("chat_no_contact_requests")
+                } else {
+                    emptyStateView.text = String.localized("chat_no_messages")
+                }
+            } else if dcChat.isGroup {
+                if dcChat.isUnpromoted {
+                    emptyStateView.text = String.localized("chat_new_group_hint")
+                } else {
+                    emptyStateView.text = String.localized("chat_no_messages")
+                }
+            } else if dcChat.isSelfTalk {
+                emptyStateView.text = String.localized("saved_messages_explain")
+            } else if dcChat.isDeviceTalk {
+                emptyStateView.text = String.localized("device_talk_explain")
+            } else {
+                emptyStateView.text = String.localizedStringWithFormat(String.localized("chat_no_messages_hint"), dcChat.name, dcChat.name)
+            }
+            emptyStateView.isHidden = false
+        } else {
+            emptyStateView.isHidden = true
+        }
+    }
+
+    private var textDraft: String? {
+        return dcContext.getDraft(chatId: chatId)
+    }
+
+    private func getMessageIds(_ count: Int, from: Int? = nil) -> [DcMsg] {
+        let ids = dcContext.getMessageIds(chatId: chatId, count: count, from: from)
+        let markIds: [UInt32] = ids.map { UInt32($0) }
+        dcContext.markSeenMessages(messageIds: markIds, count: ids.count)
+
+        return ids.map {
+            DcMsg(id: $0)
+        }
+    }
+    
+    private func getMessageIds() -> [Int] {
+        return dcContext.getMessageIds(chatId: chatId)
+    }
+
+
+    @objc private func setTextDraft() {
+        if let text = self.messageInputBar.inputTextView.text {
+            dcContext.setDraft(chatId: chatId, draftText: text)
+        }
+    }
+
+    private func configureMessageMenu() {
+        var menuItems: [UIMenuItem]
+
+        menuItems = [
+            UIMenuItem(title: String.localized("info"), action: #selector(MessageCollectionViewCell.messageInfo(_:))),
+            UIMenuItem(title: String.localized("delete"), action: #selector(MessageCollectionViewCell.messageDelete(_:))),
+            UIMenuItem(title: String.localized("forward"), action: #selector(MessageCollectionViewCell.messageForward(_:)))
+        ]
+
+        UIMenuController.shared.menuItems = menuItems
+    }
+
+    private func configureMessageInputBar() {
+        messageInputBar.delegate = self
+        messageInputBar.inputTextView.tintColor = DcColors.primary
+        messageInputBar.inputTextView.placeholder = String.localized("chat_input_placeholder")
+        messageInputBar.separatorLine.isHidden = true
+        messageInputBar.inputTextView.tintColor = DcColors.primary
+        messageInputBar.inputTextView.textColor = DcColors.defaultTextColor
+        messageInputBar.backgroundView.backgroundColor = DcColors.chatBackgroundColor
+
+        //scrollsToBottomOnKeyboardBeginsEditing = true
+
+        messageInputBar.inputTextView.backgroundColor = DcColors.inputFieldColor
+        messageInputBar.inputTextView.placeholderTextColor = DcColors.placeholderColor
+        messageInputBar.inputTextView.textContainerInset = UIEdgeInsets(top: 8, left: 16, bottom: 8, right: 38)
+        messageInputBar.inputTextView.placeholderLabelInsets = UIEdgeInsets(top: 8, left: 20, bottom: 8, right: 38)
+        messageInputBar.inputTextView.layer.borderColor = UIColor.themeColor(light: UIColor(red: 200 / 255, green: 200 / 255, blue: 200 / 255, alpha: 1),
+                                                                             dark: UIColor(red: 55 / 255, green: 55/255, blue: 55/255, alpha: 1)).cgColor
+        messageInputBar.inputTextView.layer.borderWidth = 1.0
+        messageInputBar.inputTextView.layer.cornerRadius = 13.0
+        messageInputBar.inputTextView.layer.masksToBounds = true
+        messageInputBar.inputTextView.scrollIndicatorInsets = UIEdgeInsets(top: 8, left: 0, bottom: 8, right: 0)
+        configureInputBarItems()
+    }
+
+
+    private func configureInputBarItems() {
+
+        messageInputBar.setLeftStackViewWidthConstant(to: 40, animated: false)
+        messageInputBar.setRightStackViewWidthConstant(to: 40, animated: false)
+
+
+        let sendButtonImage = UIImage(named: "paper_plane")?.withRenderingMode(.alwaysTemplate)
+        messageInputBar.sendButton.image = sendButtonImage
+        messageInputBar.sendButton.accessibilityLabel = String.localized("menu_send")
+        messageInputBar.sendButton.accessibilityTraits = .button
+        messageInputBar.sendButton.title = nil
+        messageInputBar.sendButton.tintColor = UIColor(white: 1, alpha: 1)
+        messageInputBar.sendButton.layer.cornerRadius = 20
+        messageInputBar.middleContentViewPadding = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 10)
+        // this adds a padding between textinputfield and send button
+        messageInputBar.sendButton.contentEdgeInsets = UIEdgeInsets(top: 5, left: 5, bottom: 5, right: 5)
+        messageInputBar.sendButton.setSize(CGSize(width: 40, height: 40), animated: false)
+        messageInputBar.padding = UIEdgeInsets(top: 6, left: 6, bottom: 6, right: 12)
+
+        let leftItems = [
+            InputBarButtonItem()
+                .configure {
+                    $0.spacing = .fixed(0)
+                    let clipperIcon = #imageLiteral(resourceName: "ic_attach_file_36pt").withRenderingMode(.alwaysTemplate)
+                    $0.image = clipperIcon
+                    $0.tintColor = DcColors.primary
+                    $0.setSize(CGSize(width: 40, height: 40), animated: false)
+                    $0.accessibilityLabel = String.localized("menu_add_attachment")
+                    $0.accessibilityTraits = .button
+            }.onSelected {
+                $0.tintColor = UIColor.themeColor(light: .lightGray, dark: .darkGray)
+            }.onDeselected {
+                $0.tintColor = DcColors.primary
+            }.onTouchUpInside { [weak self] _ in
+                self?.clipperButtonPressed()
+            }
+        ]
+
+        messageInputBar.setStackViewItems(leftItems, forStack: .left, animated: false)
+
+        // This just adds some more flare
+        messageInputBar.sendButton
+            .onEnabled { item in
+                UIView.animate(withDuration: 0.3, animations: {
+                    item.backgroundColor = DcColors.primary
+                })
+        }.onDisabled { item in
+            UIView.animate(withDuration: 0.3, animations: {
+                item.backgroundColor = DcColors.colorDisabled
+            })
+        }
+    }
+
+    @objc private func chatProfilePressed() {
+        if chatId != DC_CHAT_ID_DEADDROP {
+            showChatDetail(chatId: chatId)
+        }
+    }
+
+    @objc private func clipperButtonPressed() {
+        showClipperOptions()
+    }
+
+    private func showClipperOptions() {
+        let alert = UIAlertController(title: nil, message: nil, preferredStyle: .safeActionSheet)
+        let galleryAction = PhotoPickerAlertAction(title: String.localized("gallery"), style: .default, handler: galleryButtonPressed(_:))
+        let cameraAction = PhotoPickerAlertAction(title: String.localized("camera"), style: .default, handler: cameraButtonPressed(_:))
+        let documentAction = UIAlertAction(title: String.localized("files"), style: .default, handler: documentActionPressed(_:))
+        let voiceMessageAction = UIAlertAction(title: String.localized("voice_message"), style: .default, handler: voiceMessageButtonPressed(_:))
+        let isLocationStreaming = dcContext.isSendingLocationsToChat(chatId: chatId)
+        let locationStreamingAction = UIAlertAction(title: isLocationStreaming ? String.localized("stop_sharing_location") : String.localized("location"),
+                                                    style: isLocationStreaming ? .destructive : .default,
+                                                    handler: locationStreamingButtonPressed(_:))
+
+        alert.addAction(cameraAction)
+        alert.addAction(galleryAction)
+        alert.addAction(documentAction)
+        alert.addAction(voiceMessageAction)
+        if UserDefaults.standard.bool(forKey: "location_streaming") {
+            alert.addAction(locationStreamingAction)
+        }
+        alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil))
+        self.present(alert, animated: true, completion: {
+            // unfortunately, voiceMessageAction.accessibilityHint does not work,
+            // but this hack does the trick
+            if UIAccessibility.isVoiceOverRunning {
+                if let view = voiceMessageAction.value(forKey: "__representer") as? UIView {
+                    view.accessibilityHint = String.localized("a11y_voice_message_hint_ios")
+                }
+            }
+        })
+    }
+
+    private func confirmationAlert(title: String, actionTitle: String, actionStyle: UIAlertAction.Style = .default, actionHandler: @escaping ((UIAlertAction) -> Void), cancelHandler: ((UIAlertAction) -> Void)? = nil) {
+        let alert = UIAlertController(title: title,
+                                      message: nil,
+                                      preferredStyle: .safeActionSheet)
+        alert.addAction(UIAlertAction(title: actionTitle, style: actionStyle, handler: actionHandler))
+
+        alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: cancelHandler ?? { _ in
+            self.dismiss(animated: true, completion: nil)
+            }))
+        present(alert, animated: true, completion: nil)
+    }
+
+    private func askToChatWith(email: String) {
+        let contactId = self.dcContext.createContact(name: "", email: email)
+        if dcContext.getChatIdByContactId(contactId: contactId) != 0 {
+            self.dismiss(animated: true, completion: nil)
+            let chatId = self.dcContext.createChatByContactId(contactId: contactId)
+            self.showChat(chatId: chatId)
+        } else {
+            confirmationAlert(title: String.localizedStringWithFormat(String.localized("ask_start_chat_with"), email),
+                              actionTitle: String.localized("start_chat"),
+                              actionHandler: { _ in
+                                self.dismiss(animated: true, completion: nil)
+                                let chatId = self.dcContext.createChatByContactId(contactId: contactId)
+                                self.showChat(chatId: chatId)})
+        }
+    }
+
+    private func askToDeleteMessage(id: Int) {
+        let title = String.localized(stringID: "ask_delete_messages", count: 1)
+        confirmationAlert(title: title, actionTitle: String.localized("delete"), actionStyle: .destructive,
+                          actionHandler: { _ in
+                            self.dcContext.deleteMessage(msgId: id)
+                            self.dismiss(animated: true, completion: nil)})
+    }
+
+    private func askToForwardMessage() {
+        let chat = dcContext.getChat(chatId: self.chatId)
+        if chat.isSelfTalk {
+            RelayHelper.sharedInstance.forward(to: self.chatId)
+        } else {
+            confirmationAlert(title: String.localizedStringWithFormat(String.localized("ask_forward"), chat.name),
+                              actionTitle: String.localized("menu_forward"),
+                              actionHandler: { _ in
+                                RelayHelper.sharedInstance.forward(to: self.chatId)
+                                self.dismiss(animated: true, completion: nil)},
+                              cancelHandler: { _ in
+                                self.dismiss(animated: false, completion: nil)
+                                self.navigationController?.popViewController(animated: true)})
+        }
+    }
+
+    // MARK: - coordinator
+    private func showChatDetail(chatId: Int) {
+        let chat = dcContext.getChat(chatId: chatId)
+        switch chat.chatType {
+        case .SINGLE:
+            if let contactId = chat.contactIds.first {
+                let contactDetailController = ContactDetailViewController(dcContext: dcContext, contactId: contactId)
+                navigationController?.pushViewController(contactDetailController, animated: true)
+            }
+        case .GROUP, .VERIFIEDGROUP:
+            let groupChatDetailViewController = GroupChatDetailViewController(chatId: chatId, dcContext: dcContext)
+            navigationController?.pushViewController(groupChatDetailViewController, animated: true)
+        }
+    }
+
+    private func showContactDetail(of contactId: Int, in chatOfType: ChatType, chatId: Int?) {
+        let contactDetailController = ContactDetailViewController(dcContext: dcContext, contactId: contactId)
+        navigationController?.pushViewController(contactDetailController, animated: true)
+    }
+
+    func showChat(chatId: Int) {
+        if let appDelegate = UIApplication.shared.delegate as? AppDelegate {
+            navigationController?.popToRootViewController(animated: false)
+            appDelegate.appCoordinator.showChat(chatId: chatId)
+        }
+    }
+
+    private func showDocumentLibrary() {
+        mediaPicker?.showDocumentLibrary()
+    }
+
+    private func showVoiceMessageRecorder() {
+        mediaPicker?.showVoiceRecorder()
+    }
+
+    private func showCameraViewController() {
+        mediaPicker?.showCamera()
+    }
+
+    private func showPhotoVideoLibrary(delegate: MediaPickerDelegate) {
+        mediaPicker?.showPhotoVideoLibrary()
+    }
+
+    private func showMediaGallery(currentIndex: Int, mediaUrls urls: [URL]) {
+        let betterPreviewController = PreviewController(currentIndex: currentIndex, urls: urls)
+        let nav = UINavigationController(rootViewController: betterPreviewController)
+        nav.modalPresentationStyle = .fullScreen
+        navigationController?.present(nav, animated: true)
+    }
+
+    private func documentActionPressed(_ action: UIAlertAction) {
+        showDocumentLibrary()
+    }
+
+    private func voiceMessageButtonPressed(_ action: UIAlertAction) {
+        showVoiceMessageRecorder()
+    }
+
+    private func cameraButtonPressed(_ action: UIAlertAction) {
+        showCameraViewController()
+    }
+
+    private func galleryButtonPressed(_ action: UIAlertAction) {
+        showPhotoVideoLibrary(delegate: self)
+    }
+
+    private func locationStreamingButtonPressed(_ action: UIAlertAction) {
+        let isLocationStreaming = dcContext.isSendingLocationsToChat(chatId: chatId)
+        if isLocationStreaming {
+            locationStreamingFor(seconds: 0)
+        } else {
+            let alert = UIAlertController(title: String.localized("title_share_location"), message: nil, preferredStyle: .safeActionSheet)
+            addDurationSelectionAction(to: alert, key: "share_location_for_5_minutes", duration: Time.fiveMinutes)
+            addDurationSelectionAction(to: alert, key: "share_location_for_30_minutes", duration: Time.thirtyMinutes)
+            addDurationSelectionAction(to: alert, key: "share_location_for_one_hour", duration: Time.oneHour)
+            addDurationSelectionAction(to: alert, key: "share_location_for_two_hours", duration: Time.twoHours)
+            addDurationSelectionAction(to: alert, key: "share_location_for_six_hours", duration: Time.sixHours)
+            alert.addAction(UIAlertAction(title: String.localized("cancel"), style: .cancel, handler: nil))
+            self.present(alert, animated: true, completion: nil)
+        }
+    }
+
+    private func addDurationSelectionAction(to alert: UIAlertController, key: String, duration: Int) {
+        let action = UIAlertAction(title: String.localized(key), style: .default, handler: { _ in
+            self.locationStreamingFor(seconds: duration)
+        })
+        alert.addAction(action)
+    }
+
+    private func locationStreamingFor(seconds: Int) {
+        guard let appDelegate = UIApplication.shared.delegate as? AppDelegate else {
+            return
+        }
+        self.dcContext.sendLocationsToChat(chatId: self.chatId, seconds: seconds)
+        appDelegate.locationManager.shareLocation(chatId: self.chatId, duration: seconds)
+    }
+
+    private func attachPadlock(to text: NSMutableAttributedString) {
+           let imageAttachment = NSTextAttachment()
+           imageAttachment.image = UIImage(named: "ic_lock")
+           imageAttachment.image?.accessibilityIdentifier = String.localized("encrypted_message")
+           let imageString = NSMutableAttributedString(attachment: imageAttachment)
+           imageString.addAttributes([NSAttributedString.Key.baselineOffset: -1], range: NSRange(location: 0, length: 1))
+           text.append(NSAttributedString(string: " "))
+           text.append(imageString)
+       }
+
+       private func attachSendingState(_ state: Int, to text: NSMutableAttributedString) {
+           let imageAttachment = NSTextAttachment()
+           var offset = -4
+
+
+           switch Int32(state) {
+           case DC_STATE_OUT_PENDING, DC_STATE_OUT_PREPARING:
+               imageAttachment.image = #imageLiteral(resourceName: "ic_hourglass_empty_white_36pt").scaleDownImage(toMax: 16)?.maskWithColor(color: DcColors.grayDateColor)
+               imageAttachment.image?.accessibilityIdentifier = String.localized("a11y_delivery_status_sending")
+               offset = -2
+           case DC_STATE_OUT_DELIVERED:
+               imageAttachment.image = #imageLiteral(resourceName: "ic_done_36pt").scaleDownImage(toMax: 18)
+               imageAttachment.image?.accessibilityIdentifier = String.localized("a11y_delivery_status_delivered")
+           case DC_STATE_OUT_MDN_RCVD:
+               imageAttachment.image = #imageLiteral(resourceName: "ic_done_all_36pt").scaleDownImage(toMax: 18)
+               imageAttachment.image?.accessibilityIdentifier = String.localized("a11y_delivery_status_read")
+               text.append(NSAttributedString(string: " "))
+           case DC_STATE_OUT_FAILED:
+               imageAttachment.image = #imageLiteral(resourceName: "ic_error_36pt").scaleDownImage(toMax: 16)
+               imageAttachment.image?.accessibilityIdentifier = String.localized("a11y_delivery_status_error")
+               offset = -2
+           default:
+               imageAttachment.image = nil
+           }
+
+           let imageString = NSMutableAttributedString(attachment: imageAttachment)
+           imageString.addAttributes([.baselineOffset: offset],
+                                     range: NSRange(location: 0, length: 1))
+           text.append(imageString)
+       }
+
+       func updateMessage(_ messageId: Int) {
+           if let index = messageIds.firstIndex(where: { $0 == messageId }) {
+               dcContext.markSeenMessages(messageIds: [UInt32(messageId)])
+
+               //messageList[index] = DcMsg(id: messageId)
+               /// TODO: Reload section to update header/footer labels
+               /*messagesCollectionView.performBatchUpdates({ [weak self] in
+                   guard let self = self else { return }
+                   self.messagesCollectionView.reloadSections([index])
+                   if index > 0 {
+                       self.messagesCollectionView.reloadSections([index - 1])
+                   }
+                   if index < messageList.count - 1 {
+                       self.messagesCollectionView.reloadSections([index + 1])
+                   }
+               }, completion: { [weak self] _ in
+                   if self?.isLastSectionVisible() == true {
+                       self?.messagesCollectionView.scrollToBottom(animated: true)
+                   }
+               })*/
+            tableView.reloadData()
+           } else {
+               let msg = DcMsg(id: messageId)
+               if msg.chatId == chatId {
+                   insertMessage(msg)
+               }
+           }
+       }
+
+       func insertMessage(_ message: DcMsg) {
+           dcContext.markSeenMessages(messageIds: [UInt32(message.id)])
+           messageIds.append(message.id)
+           //messageList.append(message)
+           emptyStateView.isHidden = true
+           /// TODO:  Reload last section to update header/footer labels and insert a new one
+           /*messagesCollectionView.performBatchUpdates({
+               messagesCollectionView.insertSections([messageList.count - 1])
+               if messageList.count >= 2 {
+                   messagesCollectionView.reloadSections([messageList.count - 2])
+               }
+           }, completion: { [weak self] _ in
+               if self?.isLastSectionVisible() == true {
+                   self?.messagesCollectionView.scrollToBottom(animated: true)
+               }
+           })*/
+
+           tableView.reloadData()
+       }
+
+       private func sendTextMessage(message: String) {
+           DispatchQueue.global().async {
+               self.dcContext.sendTextInChat(id: self.chatId, message: message)
+           }
+       }
+
+       private func sendImage(_ image: UIImage, message: String? = nil) {
+           DispatchQueue.global().async {
+               if let path = DcUtils.saveImage(image: image) {
+                   self.sendImageMessage(viewType: DC_MSG_IMAGE, image: image, filePath: path)
+               }
+           }
+       }
+
+       private func sendAnimatedImage(url: NSURL) {
+           if let path = url.path {
+               let result = SDAnimatedImage(contentsOfFile: path)
+               if let result = result,
+                  let animatedImageData = result.animatedImageData,
+                  let pathInDocDir = DcUtils.saveImage(data: animatedImageData, suffix: "gif") {
+                   self.sendImageMessage(viewType: DC_MSG_GIF, image: result, filePath: pathInDocDir)
+               }
+           }
+       }
+
+       private func sendImageMessage(viewType: Int32, image: UIImage, filePath: String, message: String? = nil) {
+           let msg = DcMsg(viewType: viewType)
+           msg.setFile(filepath: filePath)
+           msg.text = (message ?? "").isEmpty ? nil : message
+           msg.sendInChat(id: self.chatId)
+       }
+
+       private func sendDocumentMessage(url: NSURL) {
+           DispatchQueue.global().async {
+               let msg = DcMsg(viewType: DC_MSG_FILE)
+               msg.setFile(filepath: url.relativePath, mimeType: nil)
+               msg.sendInChat(id: self.chatId)
+           }
+       }
+
+       private func sendVoiceMessage(url: NSURL) {
+           DispatchQueue.global().async {
+               let msg = DcMsg(viewType: DC_MSG_VOICE)
+               msg.setFile(filepath: url.relativePath, mimeType: "audio/m4a")
+               msg.sendInChat(id: self.chatId)
+           }
+       }
+
+       private func sendVideo(url: NSURL) {
+           DispatchQueue.global().async {
+               let msg = DcMsg(viewType: DC_MSG_VIDEO)
+               msg.setFile(filepath: url.relativePath, mimeType: "video/mp4")
+               msg.sendInChat(id: self.chatId)
+           }
+       }
+
+       private func sendImage(url: NSURL) {
+           if url.pathExtension == "gif" {
+               sendAnimatedImage(url: url)
+           } else if let data = try? Data(contentsOf: url as URL),
+                     let image = UIImage(data: data) {
+               sendImage(image)
+           }
+       }
+
+
+}
+
+extension ChatViewControllerNew: MediaSendHandler {
+    func onSuccess() {
+        refreshMessages()
+    }
+}
+
+extension ChatViewControllerNew: MediaPickerDelegate {
+    func onVideoSelected(url: NSURL) {
+        sendVideo(url: url)
+    }
+
+    func onImageSelected(url: NSURL) {
+        sendImage(url: url)
+    }
+
+    func onImageSelected(image: UIImage) {
+        sendImage(image)
+    }
+
+    func onVoiceMessageRecorded(url: NSURL) {
+        sendVoiceMessage(url: url)
+    }
+
+    func onDocumentSelected(url: NSURL) {
+        sendDocumentMessage(url: url)
+    }
+
+}
+
+// MARK: - MessageInputBarDelegate
+extension ChatViewControllerNew: InputBarAccessoryViewDelegate {
+    func inputBar(_ inputBar: InputBarAccessoryView, didPressSendButtonWith text: String) {
+        if inputBar.inputTextView.images.isEmpty {
+            self.sendTextMessage(message: text.trimmingCharacters(in: .whitespacesAndNewlines))
+        } else {
+            let trimmedText = text.replacingOccurrences(of: "\u{FFFC}", with: "", options: .literal, range: nil)
+                .trimmingCharacters(in: .whitespacesAndNewlines)
+            // only 1 attachment allowed for now, thus it takes the first one
+            self.sendImage(inputBar.inputTextView.images[0], message: trimmedText)
+        }
+        inputBar.inputTextView.text = String()
+        inputBar.inputTextView.attributedText = nil
+    }
+}

deltachat-ios/Chat/Views/Cells/NewTextMessageCell.swift

@@ -0,0 +1,42 @@
+import Foundation
+import DcCore
+import UIKit
+
+class NewTextMessageCell: UITableViewCell {
+
+    lazy var avatarView: InitialsBadge = {
+        let view = InitialsBadge(size: 28)
+        view.translatesAutoresizingMaskIntoConstraints = false
+        return view
+    }()
+
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+           super.init(style: .subtitle, reuseIdentifier: reuseIdentifier)
+           setupSubviews()
+       }
+
+       required init?(coder: NSCoder) {
+           fatalError("init(coder:) has not been implemented")
+       }
+
+    func setupSubviews() {
+        contentView.addSubview(avatarView)
+        contentView.addConstraints([
+            avatarView.constraintAlignTopTo(contentView, priority: .defaultLow),
+            avatarView.constraintAlignLeadingTo(contentView),
+            avatarView.constraintAlignBottomTo(contentView, priority: .defaultLow),
+            avatarView.constraintCenterYTo(contentView, priority: .defaultHigh)
+        ])
+    }
+
+    func update(msg: DcMsg) {
+        textLabel?.text = msg.text
+        avatarView.setName(msg.fromContact.displayName)
+    }
+
+    override func prepareForReuse() {
+        textLabel?.text = nil
+    }
+
+    
+}

deltachat-ios/Controller/ChatListController.swift

@@ -405,7 +405,8 @@ class ChatListController: UITableViewController {
     }
 
     func showChat(chatId: Int, animated: Bool = true) {
-        let chatVC = ChatViewController(dcContext: dcContext, chatId: chatId)
+        //let chatVC = ChatViewController(dcContext: dcContext, chatId: chatId)
+        let chatVC = ChatViewControllerNew(dcContext: dcContext, chatId: chatId)
         navigationController?.pushViewController(chatVC, animated: animated)
     }