 
     internal func updateSubscriptionMessages() {
         messagesQuery = subscription.fetchMessagesQueryResults()
+
         loadMoreMessagesFrom(date: nil)
-//        updateMessagesQueryNotificationBlock()
-
-        MessageManager.getHistory(subscription, lastMessageDate: nil) { [weak self] in
-//            guard let messages = self?.subscription.fetchMessages() else { return }
-//
-//            self?.appendMessages(messages: Array(messages), updateScrollPosition: false, completion: {
-//                self?.activityIndicator.stopAnimating()
-//
-//                UIView.performWithoutAnimation {
-//                    self?.scrollToBottom()
-//                }
-//
-//                self?.isRequestingHistory = false
-//            })
-        }
+        updateMessagesQueryNotificationBlock()
 
         MessageManager.changes(subscription)
     }


        let newMessages = subscription.fetchMessages(lastMessageDate: date)
        if newMessages.count > 0 {
            messages.append(contentsOf: newMessages)
            appendMessages(messages: newMessages, updateScrollPosition: true, completion: { [weak self] in
                if date == nil {
                    self?.scrollToBottom()

            textView.text = ""
            rightButton.isEnabled = true

            appendMessages(messages: [message], completion: nil)

            SubscriptionManager.sendTextMessage(message) { _ in
                Realm.executeOnMainThread({ (realm) in
                    message.temporary = false
