diff --git a/lib/content_views/messages_page.dart b/lib/content_views/messages_page.dart
index fd920a9..c2c13c0 100644
--- a/lib/content_views/messages_page.dart
+++ b/lib/content_views/messages_page.dart
@@ -80,6 +80,7 @@ class _MessagesPageState extends State<MessagesPage> {
       children: [
         Chat(
           messages: _messages,
+          textMessageOptions:const TextMessageOptions(isTextSelectable:false),
           onSendPressed: _handleSendPressed,
           showUserAvatars: false,
           showUserNames: false,
@@ -124,10 +125,11 @@ class _MessagesPageState extends State<MessagesPage> {
 
     var messages = await MyApp.isarInstance.messages.where().findAll();
     for (var message in messages) {
-      var text = '';
+      var text = message.subj.isNotEmpty ? '${message.subj}\n': '';
       for (var textLine in message.text) {
         text += '$textLine\n';
       }
+      text = text.trim();
 
       _messages.insert(0, types.TextMessage(
         author: message.from == _sid ? _user : _central,