Merge branch 'develop' into mauroromito/fullscreen_mode_2

# Conflicts:
#	Riot/Modules/Room/RoomViewController.swift

Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift

@@ -66,6 +66,7 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
         viewModel.callback = { [weak self] result in
             self?.handleViewModelResult(result)
         }
+        wysiwygViewModel.plainTextMode = !RiotSettings.shared.enableWysiwygTextFormatting
         
         inputAccessoryViewForKeyboard = UIView(frame: .zero)
         
@@ -99,6 +100,7 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
             subView.trailingAnchor.constraint(equalTo: self.trailingAnchor),
             subView.bottomAnchor.constraint(equalTo: self.bottomAnchor)
         ])
+        
         cancellables = [
             hostingViewController.heightPublisher
                 .removeDuplicates()
@@ -141,7 +143,8 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
     }
     
     private func sendWysiwygMessage(content: WysiwygComposerContent) {
-        delegate?.roomInputToolbarView?(self, sendFormattedTextMessage: content.html, withRawText: content.plainText)
+        let html = content.html.isEmpty ? content.plainText : content.html
+        delegate?.roomInputToolbarView?(self, sendFormattedTextMessage: html, withRawText: content.plainText)
     }
     
     private func showSendMediaActions() {
@@ -218,6 +221,20 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
             updatePlaceholderText()
         }
     }
+
+    /// Whether text formatting is currently enabled in the composer.
+    var textFormattingEnabled: Bool {
+        get {
+            self.viewModel.textFormattingEnabled
+        }
+        set {
+            self.viewModel.textFormattingEnabled = newValue
+            self.wysiwygViewModel.plainTextMode = !newValue
+            if !newValue {
+                self.wysiwygViewModel.maximised = false
+            }
+        }
+    }
     
     /// Add the voice message toolbar to the composer
     /// - Parameter voiceMessageToolbarView: the voice message toolbar UIView