diff --git a/config.xml b/config.xml
index 57488f7ba..186608e98 100644
--- a/config.xml
+++ b/config.xml
@@ -142,7 +142,7 @@
     <plugin name="nl.kingsquare.cordova.background-audio" spec="1.0.1" />
     <plugin name="phonegap-plugin-push" spec="https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v3">
         <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
-        <variable name="FCM_VERSION" value="17.0.+" />
+        <variable name="FCM_VERSION" value="17.5.+" />
     </plugin>
     <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application/activity[@android:name='MainActivity']">
         <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|screenLayout|smallestScreenSize" android:debuggable="true" />
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);
     }
 
     /**
diff --git a/src/core/login/pages/credentials/credentials.html b/src/core/login/pages/credentials/credentials.html
index 84a2e5c8a..dcadd2e23 100644
--- a/src/core/login/pages/credentials/credentials.html
+++ b/src/core/login/pages/credentials/credentials.html
@@ -23,7 +23,7 @@
                 <p *ngIf="siteName" padding class="item-heading core-sitename"><core-format-text [text]="siteName"></core-format-text></p>
                 <p *ngIf="siteName" class="core-siteurl">{{siteUrl}}</p>
             </div>
-            <form ion-list [formGroup]="credForm" (ngSubmit)="login($event)">
+            <form ion-list [formGroup]="credForm" (ngSubmit)="login($event)" class="core-login-form">
                 <ion-item *ngIf="siteChecked && !isBrowserSSO">
                     <ion-input type="text" name="username" placeholder="{{ 'core.login.username' | translate }}" formControlName="username" autocapitalize="none" autocorrect="off"></ion-input>
                 </ion-item>
diff --git a/src/core/login/pages/reconnect/reconnect.html b/src/core/login/pages/reconnect/reconnect.html
index a99821964..ce0edcde6 100644
--- a/src/core/login/pages/reconnect/reconnect.html
+++ b/src/core/login/pages/reconnect/reconnect.html
@@ -25,7 +25,7 @@
                 <ion-icon padding name="alert"></ion-icon> {{ 'core.login.reconnectdescription' | translate }}
             </p>
         </div>
-        <ion-list>
+        <ion-list class="core-login-form">
             <ion-item padding text-wrap class="core-username">
                 <p class="item-heading">{{ 'core.login.username' | translate }}</p>
                 <p>{{username}}</p>
diff --git a/src/core/login/pages/reconnect/reconnect.scss b/src/core/login/pages/reconnect/reconnect.scss
index bb77e8287..1125551db 100644
--- a/src/core/login/pages/reconnect/reconnect.scss
+++ b/src/core/login/pages/reconnect/reconnect.scss
@@ -19,12 +19,12 @@ ion-app.app-root page-core-login-reconnect {
         border: 1px solid $core-login-box-background-border;
         color: $core-login-box-text-color;
 
-        .item {
+        .core-login-form .item {
             background-color: $core-login-item-background-color;
             @include padding-horizontal(0);
         }
 
-        .item-inner {
+        .core-login-form .item-inner {
             background-color: $core-login-item-inner-background-color;
             @include padding-horizontal(0);
         }