diff --git a/scripts/langindex.json b/scripts/langindex.json
index b252d570f..a1ec8ec87 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -175,7 +175,8 @@
   "addon.messages.errorwhileretrievingmessages": "local_moodlemobileapp",
   "addon.messages.errorwhileretrievingusers": "local_moodlemobileapp",
   "addon.messages.groupinfo": "message",
-  "addon.messages.groupmessages": "message",
+  "addon.messages.groupconversations": "message",
+  "addon.messages.individualconversations": "message",
   "addon.messages.info": "message",
   "addon.messages.isnotinyourcontacts": "message",
   "addon.messages.message": "message",
@@ -188,8 +189,9 @@
   "addon.messages.noncontacts": "message",
   "addon.messages.nocontactsgetstarted": "message",
   "addon.messages.nofavourites": "message",
-  "addon.messages.nogroupmessages": "message",
-  "addon.messages.nomessages": "message",
+  "addon.messages.nogroupconversations": "message",
+  "addon.messages.noindividualconversations": "message",
+  "addon.messages.nomessagesfound": "message",
   "addon.messages.nousersfound": "local_moodlemobileapp",
   "addon.messages.numparticipants": "message",
   "addon.messages.removecontact": "message",
diff --git a/src/addon/messages/components/discussions/addon-messages-discussions.html b/src/addon/messages/components/discussions/addon-messages-discussions.html
index 02c90d858..dfe099c1a 100644
--- a/src/addon/messages/components/discussions/addon-messages-discussions.html
+++ b/src/addon/messages/components/discussions/addon-messages-discussions.html
@@ -33,7 +33,7 @@
             </a>
         </ion-list>
 
-        <core-empty-box *ngIf="(!discussions || discussions.length <= 0) && !search.showResults" icon="chatbubbles" [message]="'addon.messages.nomessages' | translate"></core-empty-box>
+        <core-empty-box *ngIf="(!discussions || discussions.length <= 0) && !search.showResults" icon="chatbubbles" [message]="'addon.messages.nomessagesfound' | translate"></core-empty-box>
 
         <core-empty-box *ngIf="(!search.results || search.results.length <= 0) && search.showResults" icon="search" [message]="'core.noresults' | translate"></core-empty-box>
     </core-loading>
diff --git a/src/addon/messages/lang/en.json b/src/addon/messages/lang/en.json
index 571118cf7..d7a68dddb 100644
--- a/src/addon/messages/lang/en.json
+++ b/src/addon/messages/lang/en.json
@@ -27,7 +27,8 @@
     "errorwhileretrievingmessages": "Error while retrieving messages from the server.",
     "errorwhileretrievingusers": "Error while retrieving users from the server.",
     "groupinfo": "Group info",
-    "groupmessages": "Group messages",
+    "groupconversations": "Group",
+    "individualconversations": "Private",
     "info": "Info",
     "isnotinyourcontacts": "{{$a}} is not in your contacts",
     "messagenotsent": "The message was not sent. Please try again later.",
@@ -39,9 +40,10 @@
     "nocontactrequests": "No contact requests",
     "noncontacts": "Non-contacts",
     "nocontactsgetstarted": "Try searching for someone to add them as a contact",
-    "nofavourites": "No favourites",
-    "nogroupmessages": "No group messages",
-    "nomessages": "No messages",
+    "nofavourites": "No starred conversations",
+    "nogroupconversations": "No group conversations",
+    "noindividualconversations": "No private conversations",
+    "nomessagesfound": "No messages were found",
     "nousersfound": "No users found",
     "numparticipants": "{{$a}} participants",
     "removecontact": "Remove contact",
diff --git a/src/addon/messages/pages/discussion/discussion.html b/src/addon/messages/pages/discussion/discussion.html
index 0c904ea55..cfa4dc7a0 100644
--- a/src/addon/messages/pages/discussion/discussion.html
+++ b/src/addon/messages/pages/discussion/discussion.html
@@ -58,7 +58,7 @@
                 </ion-item>
             </ng-container>
         </ion-list>
-        <core-empty-box *ngIf="!messages || messages.length <= 0" icon="chatbubbles" [message]="'addon.messages.nomessages' | translate"></core-empty-box>
+        <core-empty-box *ngIf="!messages || messages.length <= 0" icon="chatbubbles" [message]="'addon.messages.nomessagesfound' | translate"></core-empty-box>
     </core-loading>
 </ion-content>
 <ion-footer color="light" class="footer-adjustable" *ngIf="loaded && (!conversationId || conversation)">
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.html b/src/addon/messages/pages/group-conversations/group-conversations.html
index a9d9c71a1..a6a5df814 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.html
+++ b/src/addon/messages/pages/group-conversations/group-conversations.html
@@ -46,7 +46,7 @@
                 <ion-item-divider color="light" text-wrap *ngIf="group.conversations" (click)="toggle(group)" class="core-expandable">
                     <core-icon *ngIf="!group.expanded" name="fa-caret-right" item-start></core-icon>
                     <core-icon *ngIf="group.expanded" name="fa-caret-down" item-start></core-icon>
-                    {{ 'addon.messages.groupmessages' | translate }} ({{ group.count }})
+                    {{ 'addon.messages.groupconversations' | translate }} ({{ group.count }})
                     <ion-badge item-end *ngIf="group.unread">{{ group.unread }}</ion-badge>
                 </ion-item-divider>
                 <div *ngIf="group.conversations && group.expanded">
@@ -54,14 +54,14 @@
                     <!-- The infinite loading cannot be inside the ng-template, it fails because it doesn't find ion-content. -->
                     <core-infinite-loading [enabled]="group.canLoadMore" (action)="loadMoreConversations(group, $event)" [error]="group.loadMoreError"></core-infinite-loading>
                     <ion-item text-wrap *ngIf="group.conversations.length == 0">
-                        <p>{{ 'addon.messages.nogroupmessages' | translate }}</p>
+                        <p>{{ 'addon.messages.nogroupconversations' | translate }}</p>
                     </ion-item>
                 </div>
 
                 <ion-item-divider color="light" text-wrap *ngIf="individual.conversations" (click)="toggle(individual)" class="core-expandable">
                     <core-icon *ngIf="!individual.expanded" name="fa-caret-right" item-start></core-icon>
                     <core-icon *ngIf="individual.expanded" name="fa-caret-down" item-start></core-icon>
-                    {{ 'addon.messages.messages' | translate }} ({{ individual.count }})
+                    {{ 'addon.messages.individualconversations' | translate }} ({{ individual.count }})
                     <ion-badge item-end *ngIf="individual.unread">{{ individual.unread }}</ion-badge>
                 </ion-item-divider>
                 <div *ngIf="individual.conversations && individual.expanded">
@@ -69,7 +69,7 @@
                     <!-- The infinite loading cannot be inside the ng-template, it fails because it doesn't find ion-content. -->
                     <core-infinite-loading [enabled]="individual.canLoadMore" (action)="loadMoreConversations(individual, $event)" [error]="individual.loadMoreError"></core-infinite-loading>
                     <ion-item text-wrap *ngIf="individual.conversations.length == 0">
-                        <p>{{ 'addon.messages.nomessages' | translate }}</p>
+                        <p>{{ 'addon.messages.noindividualconversations' | translate }}</p>
                     </ion-item>
                 </div>
             </ion-list>
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 880a6d7fa..6c3410e73 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -174,8 +174,9 @@
     "addon.messages.errorwhileretrievingdiscussions": "Error while retrieving discussions from the server.",
     "addon.messages.errorwhileretrievingmessages": "Error while retrieving messages from the server.",
     "addon.messages.errorwhileretrievingusers": "Error while retrieving users from the server.",
+    "addon.messages.groupconversations": "Group",
     "addon.messages.groupinfo": "Group info",
-    "addon.messages.groupmessages": "Group messages",
+    "addon.messages.individualconversations": "Private",
     "addon.messages.info": "Info",
     "addon.messages.isnotinyourcontacts": "{{$a}} is not in your contacts",
     "addon.messages.message": "Message",
@@ -186,9 +187,10 @@
     "addon.messages.newmessages": "New messages",
     "addon.messages.nocontactrequests": "No contact requests",
     "addon.messages.nocontactsgetstarted": "Try searching for someone to add them as a contact",
-    "addon.messages.nofavourites": "No favourites",
-    "addon.messages.nogroupmessages": "No group messages",
-    "addon.messages.nomessages": "No messages",
+    "addon.messages.nofavourites": "No starred conversations",
+    "addon.messages.nogroupconversations": "No group conversations",
+    "addon.messages.noindividualconversations": "No private conversations",
+    "addon.messages.nomessagesfound": "No messages were found",
     "addon.messages.noncontacts": "Non-contacts",
     "addon.messages.nousersfound": "No users found",
     "addon.messages.numparticipants": "{{$a}} participants",
diff --git a/src/core/login/pages/reconnect/reconnect.scss b/src/core/login/pages/reconnect/reconnect.scss
index ae0e7ea16..bb77e8287 100644
--- a/src/core/login/pages/reconnect/reconnect.scss
+++ b/src/core/login/pages/reconnect/reconnect.scss
@@ -20,12 +20,12 @@ ion-app.app-root page-core-login-reconnect {
         color: $core-login-box-text-color;
 
         .item {
-            background: $core-login-item-background-color;
+            background-color: $core-login-item-background-color;
             @include padding-horizontal(0);
         }
 
         .item-inner {
-            background: $core-login-item-inner-background-color;
+            background-color: $core-login-item-inner-background-color;
             @include padding-horizontal(0);
         }
     }