diff --git a/qml/TweetPopup.qml b/qml/TweetPopup.qml
index 6adf1ed..41d345c 100644
--- a/qml/TweetPopup.qml
+++ b/qml/TweetPopup.qml
@@ -88,8 +88,11 @@ Popup {
 
                 onClicked: {
                     popup.close()
-                    uiBridge.tweetButton(popup.messageid,
-                                         "@" + author + " " + messageArea.text)
+                    var msg = messageArea.text
+                    if (popup.messageid > 0) {
+                        msg = "@" + author + " " + msg
+                    }
+                    uiBridge.tweetButton(popup.messageid, msg)
                     messageArea.clear()
                 }
             }