diff --git a/index.html b/index.html
index 773c267..23b329b 100644
--- a/index.html
+++ b/index.html
@@ -334,7 +334,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
                   <span class="cof-chat_time cob-chat_time coa-chat_time" ng-bind-html="::bufferline.formattedTime"></span>
                 </span>
               </td>
-              <td class="prefix"><span ng-class="::{'repeated-prefix': bufferline.prefixtext==bufferlines[$index-1].prefixtext}"><a ng-click="addMention(bufferline.prefix)"><span class="hidden-bracket">&lt;</span><span ng-repeat="part in ::bufferline.prefix" ng-class="::part.classes" ng-bind="::part.text|prefixlimit:25"></span><span class="hidden-bracket">&gt;</span></a></span></td><!--
+              <td class="prefix"><span ng-class="::{'repeated-prefix': bufferline.prefixtext==bufferlines[$index-1].prefixtext}"><a ng-click="addMention(bufferline)"><span class="hidden-bracket" ng-if="::(bufferline.showHiddenBrackets)">&lt;</span><span ng-repeat="part in ::bufferline.prefix" ng-class="::part.classes" ng-bind="::part.text|prefixlimit:25"></span><span class="hidden-bracket" ng-if="::(bufferline.showHiddenBrackets)">&gt;</span></a></span></td><!--
            --><td class="message"><!--
              --><div ng-repeat="metadata in ::bufferline.metadata" plugin data="::metadata"></div><!--
              --><span ng-repeat="part in ::bufferline.content" class="text" ng-class="::part.classes.concat(['line-' + part.$$hashKey.replace(':','_')])" ng-bind-html="::part.text | linky:'_blank':{rel:'noopener noreferrer'} | DOMfilter:'irclinky' | DOMfilter:'emojify':settings.enableJSEmoji | DOMfilter:'inlinecolour' | DOMfilter:'latexmath':('.line-' + part.$$hashKey.replace(':','_')):settings.enableMathjax"></span>
diff --git a/js/inputbar.js b/js/inputbar.js
index 52d1504..2d6054a 100644
--- a/js/inputbar.js
+++ b/js/inputbar.js
@@ -208,7 +208,12 @@ weechat.directive('inputBar', function() {
             };
 
             //XXX THIS DOES NOT BELONG HERE!
-            $rootScope.addMention = function(prefix) {
+            $rootScope.addMention = function(bufferline) {
+                if (!bufferline.showHiddenBrackets) {
+                    // the line is a notice or action or something else that doesn't belong
+                    return;
+                }
+                var prefix = bufferline.prefix;
                 // Extract nick from bufferline prefix
                 var nick = prefix[prefix.length - 1].text;
 
diff --git a/js/models.js b/js/models.js
index f465ee2..ed3e6f1 100644
--- a/js/models.js
+++ b/js/models.js
@@ -359,6 +359,11 @@ models.service('models', ['$rootScope', '$filter', 'bufferResume', function($roo
         var highlight = message.highlight;
         var content = parseRichText(message.message);
 
+        // only put invisible angle brackets around nicks in normal messages
+        // (for copying/pasting)
+        var showHiddenBrackets = (tags_array.indexOf('irc_privmsg') >= 0 &&
+                                  tags_array.indexOf('irc_action') === -1);
+
         if (highlight) {
             prefix.forEach(function(textEl) {
                 textEl.classes.push('highlight');
@@ -386,8 +391,8 @@ models.service('models', ['$rootScope', '$filter', 'bufferResume', function($roo
             highlight: highlight,
             displayed: displayed,
             prefixtext: prefixtext,
-            text: rtext
-
+            text: rtext,
+            showHiddenBrackets: showHiddenBrackets
         };
 
     };