diff --git a/src/addon/messages/components/confirmed-contacts/addon-messages-confirmed-contacts.html b/src/addon/messages/components/confirmed-contacts/addon-messages-confirmed-contacts.html
index ac2436fa6..ccd7bd268 100644
--- a/src/addon/messages/components/confirmed-contacts/addon-messages-confirmed-contacts.html
+++ b/src/addon/messages/components/confirmed-contacts/addon-messages-confirmed-contacts.html
@@ -5,7 +5,7 @@
     <core-loading [hideUntil]="loaded" class="core-loading-center">
         <ion-list no-margin>
             <a ion-item text-wrap *ngFor="let contact of contacts" [title]="contact.fullname" (click)="selectUser(contact.id)" [class.core-split-item-selected]="contact.id == selectedUserId" class="addon-messages-conversation-item">
-                <ion-avatar item-start core-user-avatar [user]="contact" [checkOnline]="true" [linkProfile]="false"></ion-avatar>
+                <ion-avatar item-start core-user-avatar [user]="contact" [checkOnline]="contact.showonlinestatus" [linkProfile]="false"></ion-avatar>
                 <h2>
                     <core-format-text [text]="contact.fullname"></core-format-text>
                     <core-icon *ngIf="contact.isblocked" name="fa-ban" item-end></core-icon>
diff --git a/src/addon/messages/components/contact-requests/addon-messages-contact-requests.html b/src/addon/messages/components/contact-requests/addon-messages-contact-requests.html
index 1ae936283..b3bffbf68 100644
--- a/src/addon/messages/components/contact-requests/addon-messages-contact-requests.html
+++ b/src/addon/messages/components/contact-requests/addon-messages-contact-requests.html
@@ -5,7 +5,7 @@
     <core-loading [hideUntil]="loaded" class="core-loading-center">
         <ion-list no-margin>
             <a ion-item text-wrap *ngFor="let request of requests" [title]="request.fullname" (click)="selectUser(request.id)" [class.core-split-item-selected]="request.id == selectedUserId" class="addon-messages-conversation-item">
-                <ion-avatar item-start core-user-avatar [user]="request" [checkOnline]="true" [linkProfile]="false"></ion-avatar>
+                <ion-avatar item-start core-user-avatar [user]="request" [linkProfile]="false"></ion-avatar>
                 <h2><core-format-text [text]="request.fullname"></core-format-text></h2>
                 <p *ngIf="!request.iscontact && !request.confirmedOrDeclined">{{ 'addon.messages.wouldliketocontactyou' | translate }}</p>
             </a>
diff --git a/src/addon/messages/components/contacts/addon-messages-contacts.html b/src/addon/messages/components/contacts/addon-messages-contacts.html
index 29c6853f6..009412aba 100644
--- a/src/addon/messages/components/contacts/addon-messages-contacts.html
+++ b/src/addon/messages/components/contacts/addon-messages-contacts.html
@@ -19,7 +19,7 @@
                 <ng-container *ngFor="let contact of contacts[contactType]">
                     <!-- Don't show deleted users -->
                     <a ion-item text-wrap *ngIf="contact.profileimageurl || contact.profileimageurlsmall"  [title]="contact.fullname" (click)="gotoDiscussion(contact.id)" [class.core-split-item-selected]="contact.id == discussionUserId" class="addon-messages-conversation-item">
-                        <ion-avatar core-user-avatar [user]="contact" item-start></ion-avatar>
+                        <ion-avatar core-user-avatar [user]="contact" item-start [checkOnline]="contact.showonlinestatus"></ion-avatar>
                         <h2><core-format-text [text]="contact.fullname"></core-format-text></h2>
                     </a>
                 </ng-container>
diff --git a/src/addon/messages/components/discussions/addon-messages-discussions.html b/src/addon/messages/components/discussions/addon-messages-discussions.html
index dfe099c1a..0d4a834aa 100644
--- a/src/addon/messages/components/discussions/addon-messages-discussions.html
+++ b/src/addon/messages/components/discussions/addon-messages-discussions.html
@@ -13,7 +13,7 @@
                 <ion-note item-end>{{ search.results.length }}</ion-note>
             </ion-item-divider>
             <a ion-item text-wrap *ngFor="let result of search.results" [title]="result.fullname" (click)="gotoDiscussion(result.userid, result.messageid)" [class.core-split-item-selected]="result.userid == discussionUserId" class="addon-message-discussion">
-                <ion-avatar core-user-avatar [user]="result" item-start></ion-avatar>
+                <ion-avatar core-user-avatar [user]="result" item-start [checkOnline]="result.showonlinestatus"></ion-avatar>
                 <h2><core-format-text [text]="result.fullname"></core-format-text></h2>
                 <p><core-format-text clean="true" singleLine="true" [text]="result.lastmessage"></core-format-text></p>
             </a>
@@ -21,7 +21,7 @@
 
         <ion-list *ngIf="!search.showResults" no-margin>
             <a ion-item text-wrap *ngFor="let discussion of discussions" [title]="discussion.fullname" (click)="gotoDiscussion(discussion.message.user)" [class.core-split-item-selected]="discussion.message.user == discussionUserId" class="addon-message-discussion">
-                <ion-avatar core-user-avatar [user]="discussion" item-start></ion-avatar>
+                <ion-avatar core-user-avatar [user]="discussion" item-start [checkOnline]="discussion.showonlinestatus"></ion-avatar>
                 <h2>
                     <core-format-text [text]="discussion.fullname"></core-format-text>
                 </h2>
diff --git a/src/addon/messages/pages/conversation-info/conversation-info.html b/src/addon/messages/pages/conversation-info/conversation-info.html
index b85f694a7..36af28369 100644
--- a/src/addon/messages/pages/conversation-info/conversation-info.html
+++ b/src/addon/messages/pages/conversation-info/conversation-info.html
@@ -15,8 +15,8 @@
 
     <core-loading [hideUntil]="loaded">
         <ion-item text-center *ngIf="conversation">
-            <div class="item-avatar-center" *ngIf="conversation.imageurl">
-                <img class="avatar" [src]="conversation.imageurl" core-external-content [alt]="conversation.name" role="presentation">
+            <div class="item-avatar-center">
+                <img class="avatar" [src]="conversation.imageurl" core-external-content [alt]="conversation.name" role="presentation" onError="this.src='assets/img/group-avatar.png'">
             </div>
             <h2><core-format-text [text]="conversation.name"></core-format-text></h2>
             <p><core-format-text *ngIf="conversation.subname" [text]="conversation.subname"></core-format-text></p>
diff --git a/src/addon/messages/pages/conversation-info/conversation-info.ts b/src/addon/messages/pages/conversation-info/conversation-info.ts
index cd2d3dd5f..b79ece62b 100644
--- a/src/addon/messages/pages/conversation-info/conversation-info.ts
+++ b/src/addon/messages/pages/conversation-info/conversation-info.ts
@@ -56,7 +56,7 @@ export class AddonMessagesConversationInfoPage implements OnInit {
      */
     protected fetchData(): Promise<any> {
         // Get the conversation data first.
-        return this.messagesProvider.getConversation(this.conversationId, false, false, 0, 0).then((conversation) => {
+        return this.messagesProvider.getConversation(this.conversationId, false, true, 0, 0).then((conversation) => {
             this.conversation = conversation;
 
             // Now get the members.
diff --git a/src/addon/messages/pages/discussion/discussion.html b/src/addon/messages/pages/discussion/discussion.html
index dbda39413..8eacd2b4c 100644
--- a/src/addon/messages/pages/discussion/discussion.html
+++ b/src/addon/messages/pages/discussion/discussion.html
@@ -1,9 +1,9 @@
 <ion-header>
     <ion-navbar core-back-button>
         <ion-title>
-            <img *ngIf="!otherMember && conversationImage" class="core-bar-button-image" [src]="conversationImage" alt="" onError="this.src='assets/img/user-avatar.png'" core-external-content role="presentation" [siteId]="siteId || null">
-            <ion-avatar *ngIf="otherMember" class="core-bar-button-image" core-user-avatar [user]="otherMember" [linkProfile]="false" [checkOnline]="otherMember.showonlinestatus" item-start></ion-avatar>
-            <core-format-text [text]="title"></core-format-text>
+            <img *ngIf="!otherMember && conversationImage" class="core-bar-button-image" [src]="conversationImage" alt="" onError="this.src='assets/img/group-avatar.png'" core-external-content role="presentation" [siteId]="siteId || null">
+            <ion-avatar *ngIf="otherMember" class="core-bar-button-image" core-user-avatar [user]="otherMember" [linkProfile]="false" [checkOnline]="otherMember.showonlinestatus" item-start (click)="showInfo && viewInfo()"></ion-avatar>
+            <core-format-text [text]="title" (click)="showInfo && !isGroup && viewInfo()"></core-format-text>
             <core-icon *ngIf="conversation && conversation.isfavourite" name="fa-star"></core-icon>
         </ion-title>
         <ion-buttons end></ion-buttons>
diff --git a/src/addon/messages/pages/discussion/discussion.scss b/src/addon/messages/pages/discussion/discussion.scss
index abab2f8e4..ed24ee525 100644
--- a/src/addon/messages/pages/discussion/discussion.scss
+++ b/src/addon/messages/pages/discussion/discussion.scss
@@ -5,6 +5,10 @@ $item-message-note-font-size: 75% !default;
 $item-message-mine-bg: $gray-light !default;
 
 ion-app.app-root page-addon-messages-discussion {
+    .toolbar-title {
+        padding: 0;
+    }
+
     ion-content {
         background-color: $gray-lighter !important;
     }
diff --git a/src/addon/messages/pages/discussion/discussion.ts b/src/addon/messages/pages/discussion/discussion.ts
index 3d1a6d161..03b442b54 100644
--- a/src/addon/messages/pages/discussion/discussion.ts
+++ b/src/addon/messages/pages/discussion/discussion.ts
@@ -393,7 +393,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
         if (conversationId) {
             promise = Promise.resolve(conversationId);
         } else {
-            promise = this.messagesProvider.getConversationBetweenUsers(userId).then((conversation) => {
+            promise = this.messagesProvider.getConversationBetweenUsers(userId, undefined, true).then((conversation) => {
                 fallbackConversation = conversation;
 
                 return conversation.id;
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.html b/src/addon/messages/pages/group-conversations/group-conversations.html
index a6a5df814..5452f9ebb 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.html
+++ b/src/addon/messages/pages/group-conversations/group-conversations.html
@@ -81,8 +81,8 @@
 <ng-template #conversationsTemplate let-conversations="conversations">
     <a ion-item text-wrap *ngFor="let conversation of conversations" [title]="conversation.name" (click)="gotoConversation(conversation.id, conversation.userid)" [class.core-split-item-selected]="(conversation.id && conversation.id == selectedConversationId) || (conversation.userid && conversation.userid == selectedUserId)" class="addon-message-discussion" id="addon-message-conversation-{{ conversation.id ? conversation.id : 'user-' + conversation.userid }}">
         <!-- Group conversation image. -->
-        <ion-avatar item-start *ngIf="conversation.type != typeIndividual && conversation.imageurl">
-            <img [src]="conversation.imageurl" [alt]="conversation.name" core-external-content>
+        <ion-avatar item-start *ngIf="conversation.type != typeIndividual">
+            <img [src]="conversation.imageurl" [alt]="conversation.name" core-external-content onError="this.src='assets/img/group-avatar.png'">
         </ion-avatar>
 
         <!-- Avatar for individual conversations. -->
diff --git a/src/addon/messages/providers/messages.ts b/src/addon/messages/providers/messages.ts
index b2e26ccbd..7b5cfe940 100644
--- a/src/addon/messages/providers/messages.ts
+++ b/src/addon/messages/providers/messages.ts
@@ -809,7 +809,8 @@ export class AddonMessagesProvider {
                     conversationid: conversationId,
                     limitfrom: limitFrom,
                     limitnum: limitTo < 1 ? limitTo : limitTo + 1, // If there is a limit, get 1 more than requested.
-                    includecontactrequests: includeContactRequests ? 1 : 0
+                    includecontactrequests: includeContactRequests ? 1 : 0,
+                    includeprivacyinfo: 1,
                 };
 
             return site.read('core_message_get_conversation_members', params, preSets).then((members) => {
diff --git a/src/assets/img/group-avatar.png b/src/assets/img/group-avatar.png
new file mode 100644
index 000000000..2e336c95c
Binary files /dev/null and b/src/assets/img/group-avatar.png differ
diff --git a/src/components/user-avatar/user-avatar.scss b/src/components/user-avatar/user-avatar.scss
index 775b0cacf..5962d9658 100644
--- a/src/components/user-avatar/user-avatar.scss
+++ b/src/components/user-avatar/user-avatar.scss
@@ -12,4 +12,9 @@ ion-avatar[core-user-avatar] {
             background-color: $core-online-color;
         }
     }
+}
+
+.toolbar ion-avatar[core-user-avatar] .contact-status {
+    width: 10px;
+    height: 10px;
 }
\ No newline at end of file
diff --git a/src/components/user-avatar/user-avatar.ts b/src/components/user-avatar/user-avatar.ts
index bbbb09c90..627fb1a5b 100644
--- a/src/components/user-avatar/user-avatar.ts
+++ b/src/components/user-avatar/user-avatar.ts
@@ -15,6 +15,7 @@
 import { Component, Input, OnInit, OnChanges, SimpleChange } from '@angular/core';
 import { NavController } from 'ionic-angular';
 import { CoreSitesProvider } from '@providers/sites';
+import { CoreAppProvider } from '@providers/app';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 
 /**
@@ -42,7 +43,8 @@ export class CoreUserAvatarComponent implements OnInit, OnChanges {
     protected myUser = false;
     protected currentUserId: number;
 
-    constructor(private navCtrl: NavController, private sitesProvider: CoreSitesProvider, private utils: CoreUtilsProvider) {
+    constructor(private navCtrl: NavController, private sitesProvider: CoreSitesProvider, private utils: CoreUtilsProvider,
+            private appProvider: CoreAppProvider) {
         this.currentUserId = this.sitesProvider.getCurrentSiteUserId();
     }
 
@@ -100,7 +102,8 @@ export class CoreUserAvatarComponent implements OnInit, OnChanges {
 
             return this.user.lastaccess * 1000 >= time;
         } else {
-            return this.user.isonline;
+            // You have to have Internet access first.
+            return this.user.isonline && this.appProvider.isOnline();
         }
     }