diff --git a/src/plugins/sib-reply-to-message.js b/src/plugins/sib-reply-to-message.js
index cc36c79755b5ee1143e316922c617b7ef9f4e540..4871e3ea4f91bd6ef4714e849b24d1e328ffdb59 100644
--- a/src/plugins/sib-reply-to-message.js
+++ b/src/plugins/sib-reply-to-message.js
@@ -1,5 +1,6 @@
 /**
  * Add an action button to reply to a message.
+ * TODO: Add settings to handle this plugin
  */
 converse.plugins.add('sib-reply-to-message', {
   initialize() {
@@ -11,7 +12,7 @@ converse.plugins.add('sib-reply-to-message', {
 
       // Do not add if the message is not from a MUC
       // Do not add if the message is from the current user
-      if (el.model.get('type') !== 'groupchat' || el.model.get('from_real_jid') === _converse.bare_jid) {
+      if (el.model.get('type') !== 'groupchat' || el.model.get('sender') === 'me') {
         return buttons;
       }