diff --git a/src/addon/messages/pages/discussion/discussion.scss b/src/addon/messages/pages/discussion/discussion.scss
index 2445c99e4..ddffe0900 100644
--- a/src/addon/messages/pages/discussion/discussion.scss
+++ b/src/addon/messages/pages/discussion/discussion.scss
@@ -176,6 +176,10 @@ ion-app.app-root page-addon-messages-discussion {
             @include margin-horizontal(null, -0.5rem);
             border-bottom-color: $item-message-mine-bg;
         }
+
+        &.activated .tail {
+            border-bottom-color: darken($item-message-mine-bg, 10%);
+        }
     }
 
     .addon-message-not-mine .tail {
@@ -184,6 +188,10 @@ ion-app.app-root page-addon-messages-discussion {
         border-bottom-color: $item-message-bg;
     }
 
+    .addon-message-not-mine.activated .tail {
+        border-bottom-color: darken($item-message-bg, 10%);
+    }
+
     .toolbar-title {
         img {
             @include margin-horizontal(null, 6px);
diff --git a/src/addon/messages/pages/discussion/discussion.ts b/src/addon/messages/pages/discussion/discussion.ts
index 1b0036998..a025a6f27 100644
--- a/src/addon/messages/pages/discussion/discussion.ts
+++ b/src/addon/messages/pages/discussion/discussion.ts
@@ -23,6 +23,7 @@ import { AddonMessagesSyncProvider } from '../../providers/sync';
 import { CoreUserProvider } from '@core/user/providers/user';
 import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreUtilsProvider } from '@providers/utils/utils';
+import { CoreTextUtilsProvider } from '@providers/utils/text';
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreAppProvider } from '@providers/app';
 import { coreSlideInOut } from '@classes/animations';
@@ -97,7 +98,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
             private domUtils: CoreDomUtilsProvider, private messagesProvider: AddonMessagesProvider, logger: CoreLoggerProvider,
             private utils: CoreUtilsProvider, private appProvider: CoreAppProvider, private translate: TranslateService,
             @Optional() private svComponent: CoreSplitViewComponent, private messagesOffline: AddonMessagesOfflineProvider,
-            private modalCtrl: ModalController) {
+            private modalCtrl: ModalController, private textUtils: CoreTextUtilsProvider) {
 
         this.siteId = sitesProvider.getCurrentSiteId();
         this.currentUserId = sitesProvider.getCurrentSiteUserId();
@@ -800,7 +801,8 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
      * @param {any} message Message to be copied.
      */
     copyMessage(message: any): void {
-        this.utils.copyToClipboard(message.smallmessage || message.text || '');
+        const text = this.textUtils.decodeHTMLEntities(message.smallmessage || message.text || '');
+        this.utils.copyToClipboard(text);
     }
 
     /**