=== modified file 'src/qml/ThreadDelegate.qml'
--- src/qml/ThreadDelegate.qml	2015-10-23 20:41:36 +0000
+++ src/qml/ThreadDelegate.qml	2016-02-02 19:33:16 +0000
@@ -53,6 +53,10 @@
         return firstRecipient
     }
 
+    function formatDisplayedText(text) {
+        return text.replace("\n", " ")
+    }
+
     property string textMessage: {
         // check if this is an mms, if so, search for the actual text
         var imageCount = 0
@@ -85,7 +89,7 @@
         if (attachmentCount > 0) {
             return i18n.tr("Attachment: %1 file", "Attachments: %1 files").arg(attachmentCount)
         }
-        return displayedEventTextMessage
+        return formatDisplayedText(displayedEventTextMessage)
     }
     anchors.left: parent.left
     anchors.right: parent.right
@@ -220,6 +224,9 @@
         elide: Text.ElideRight
         fontSize: "x-small"
         text: textMessage
+        // avoid any kind of formatting in the text message preview
+        textFormat: Text.PlainText
+        maximumLineCount: 1
     }
 
     Item {

