diff --git a/lib/models/contact.dart b/lib/models/contact.dart
index 0589957d..a6fa8234 100644
--- a/lib/models/contact.dart
+++ b/lib/models/contact.dart
@@ -101,8 +101,7 @@ class ContactInfoState extends ChangeNotifier {
     keys = Map<String, GlobalKey<MessageRowState>>();
   }
 
-  String get nickname => this._nickname + (this._messageDraft.isNotEmpty() ? "*" : "");
-
+  String get nickname => this._nickname + (this._messageDraft.isEmpty() ? "" : "*");
   String get savePeerHistory => this._savePeerHistory;
 
   String? get acnCircuit => this._acnCircuit;
diff --git a/lib/models/message_draft.dart b/lib/models/message_draft.dart
index c683b48c..0112569e 100644
--- a/lib/models/message_draft.dart
+++ b/lib/models/message_draft.dart
@@ -11,8 +11,8 @@ class MessageDraft extends ChangeNotifier {
     return MessageDraft();
   }
 
-  bool isNotEmpty() {
-    return this._messageText != null || this._quotedReference != null;
+  bool isEmpty() {
+    return (this._messageText == null && this._quotedReference == null) || (this._messageText != null && this._messageText!.isEmpty);
   }
 
   String? get messageText => _messageText;