diff --git a/src/plugins/sib-reply-to-message.js b/src/plugins/sib-reply-to-message.js
index 1d878ce48bed645dd3807d97246ab2e4ce2a9a4d..982528ec66aff0ce1c81134a64460f474fa8c6ec 100644
--- a/src/plugins/sib-reply-to-message.js
+++ b/src/plugins/sib-reply-to-message.js
@@ -13,12 +13,6 @@ converse.plugins.add('sib-reply-to-message', {
     }
 
     api.listen.on('getMessageActionButtons', (el, buttons) => {
-
-      // Do not add if the message is from the current user
-      if (el.model.get('sender') === 'me') {
-        return buttons;
-      }
-
       buttons.push({
         'i18n_text': __('Reply'),
         'handler': ev => {
@@ -32,8 +26,9 @@ converse.plugins.add('sib-reply-to-message', {
           }
 
           // Add mention to the initial author for MUCs
+          // Do not add the mention if you were the author of the original message
           const nickname = el.model.get('nick');
-          if (el.model.get('type') === 'groupchat' && nickname.length) {
+          if (el.model.get('type') === 'groupchat' && el.model.get('sender') !== 'me' && nickname.length) {
             chat_textarea.value += `@${nickname} `;
           }