diff --git a/src/addon/messages/pages/discussion/discussion.ts b/src/addon/messages/pages/discussion/discussion.ts
index 953a57f21..e2f2100b2 100644
--- a/src/addon/messages/pages/discussion/discussion.ts
+++ b/src/addon/messages/pages/discussion/discussion.ts
@@ -141,7 +141,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
         const position = this.messages.findIndex((message) => {
             return message.hash == hash;
         });
-        if (position > 0) {
+        if (position >= 0) {
             this.messages.splice(position, 1);
         }
     }
@@ -176,7 +176,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
 
             if (this.groupMessagingEnabled) {
                 // Get the conversation ID if it exists and we don't have it yet.
-                return this.getConversation().then((exists) => {
+                return this.getConversation(this.conversationId, this.userId).then((exists) => {
                     if (exists) {
                         // Fetch the messages for the first time.
                         return this.fetchMessages();
@@ -202,6 +202,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
             this.checkCanDelete();
             this.resizeContent();
             this.loaded = true;
+            this.setPolling(); // Make sure we're polling messages.
         });
 
         // Recalculate footer position when keyboard is shown or hidden.
@@ -324,22 +325,24 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
     /**
      * Get the conversation.
      *
+     * @param {number} conversationId Conversation ID.
+     * @param {number} userId User ID.
      * @return {Promise<boolean>} Promise resolved with a boolean: whether the conversation exists or not.
      */
-    protected getConversation(): Promise<boolean> {
+    protected getConversation(conversationId: number, userId: number): Promise<boolean> {
         let promise;
 
-        if (this.conversationId) {
+        if (conversationId) {
             // Retrieve the conversation. Invalidate data first to get the right unreadcount.
-            promise = this.messagesProvider.invalidateConversation(this.conversationId).then(() => {
-                return this.messagesProvider.getConversation(this.conversationId);
+            promise = this.messagesProvider.invalidateConversation(conversationId).then(() => {
+                return this.messagesProvider.getConversation(conversationId);
             });
         } else {
             // We don't have the conversation ID, check if it exists.
-            promise = this.messagesProvider.getConversationBetweenUsers(this.userId).catch((error) => {
+            promise = this.messagesProvider.getConversationBetweenUsers(userId).catch((error) => {
 
                 // Probably conversation does not exist or user is offline. Try to load offline messages.
-                return this.messagesOffline.getMessages(this.userId).then((messages) => {
+                return this.messagesOffline.getMessages(userId).then((messages) => {
                     if (messages && messages.length) {
                         // We have offline messages, this probably means that the conversation didn't exist. Don't display error.
                         messages.forEach((message) => {
@@ -358,6 +361,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
 
         return promise.then((conversation) => {
             this.conversation = conversation;
+
             if (conversation) {
                 this.conversationId = conversation.id;
                 this.title = conversation.name;
@@ -822,8 +826,19 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
                 this.messagesBeingSent--;
 
                 if (data.sent) {
-                    // Message was sent, fetch messages right now.
-                    promise = this.fetchMessages();
+                    if (!this.conversationId && data.message && data.message.conversationid) {
+                        // Message sent to a new conversation, try to load the conversation.
+                        promise = this.getConversation(data.message.conversationid, this.userId).then(() => {
+                            // Now fetch messages.
+                            return this.fetchMessages();
+                        }).finally(() => {
+                            // Start polling messages now that the conversation exists.
+                            this.setPolling();
+                        });
+                    } else {
+                        // Message was sent, fetch messages right now.
+                        promise = this.fetchMessages();
+                    }
                 } else {
                     promise = Promise.reject(null);
                 }
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.html b/src/addon/messages/pages/group-conversations/group-conversations.html
index 70bd51f67..92c80a6b4 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.html
+++ b/src/addon/messages/pages/group-conversations/group-conversations.html
@@ -97,7 +97,7 @@
 
 <!-- Template to render a list of conversations. -->
 <ng-template #conversationsTemplate let-conversations="conversations" let-avatarOptional="avatarOptional">
-    <a ion-item text-wrap *ngFor="let conversation of conversations" [title]="conversation.name" detail-none (click)="gotoConversation(conversation.id, conversation.userid)" [class.core-split-item-selected]="conversation.id == selectedConversation">
+    <a ion-item text-wrap *ngFor="let conversation of conversations" [title]="conversation.name" detail-none (click)="gotoConversation(conversation.id, conversation.userid)" [class.core-split-item-selected]="(conversation.id && conversation.id == selectedConversationId) || (conversation.userid && conversation.userid == selectedUserId)">
         <ion-avatar item-start *ngIf="conversation.imageurl || !avatarOptional">
             <img src="{{conversation.imageurl}}" [alt]="conversation.name" core-external-content onError="this.src='assets/img/user-avatar.png'">
             <!-- @todo: Display connection status.
diff --git a/src/addon/messages/pages/group-conversations/group-conversations.ts b/src/addon/messages/pages/group-conversations/group-conversations.ts
index 893e438f7..86139bf13 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.ts
+++ b/src/addon/messages/pages/group-conversations/group-conversations.ts
@@ -39,7 +39,8 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
 
     loaded = false;
     loadingMessage: string;
-    selectedConversation: number;
+    selectedConversationId: number;
+    selectedUserId: number;
     search = {
         enabled: false,
         showResults: false,
@@ -267,7 +268,8 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
      * @param {number} [messageId] Message to scroll after loading the discussion. Used when searching.
      */
     gotoConversation(conversationId: number, userId?: number, messageId?: number): void {
-        this.selectedConversation = conversationId;
+        this.selectedConversationId = conversationId;
+        this.selectedUserId = userId;
 
         const params = {
             conversationId: conversationId,
diff --git a/src/addon/messages/providers/messages.ts b/src/addon/messages/providers/messages.ts
index 50b05641c..11d16df55 100644
--- a/src/addon/messages/providers/messages.ts
+++ b/src/addon/messages/providers/messages.ts
@@ -1438,8 +1438,11 @@ export class AddonMessagesProvider {
             }
 
             // Online and no messages stored. Send it to server.
-            return this.sendMessageOnline(toUserId, message).then(() => {
-                return { sent: true };
+            return this.sendMessageOnline(toUserId, message).then((result) => {
+                return {
+                    sent: true,
+                    message: result
+                };
             }).catch((error) => {
                 if (this.utils.isWebServiceError(error)) {
                     // It's a WebService error, the user cannot send the message so don't store it.
@@ -1479,6 +1482,8 @@ export class AddonMessagesProvider {
 
             return this.invalidateDiscussionCache(toUserId, siteId).catch(() => {
                 // Ignore errors.
+            }).then(() => {
+                return response[0];
             });
         });
     }
@@ -1543,8 +1548,11 @@ export class AddonMessagesProvider {
             }
 
             // Online and no messages stored. Send it to server.
-            return this.sendMessageToConversationOnline(conversation.id, message).then(() => {
-                return { sent: true };
+            return this.sendMessageToConversationOnline(conversation.id, message).then((result) => {
+                return {
+                    sent: true,
+                    message: result
+                };
             }).catch((error) => {
                 if (this.utils.isWebServiceError(error)) {
                     // It's a WebService error, the user cannot send the message so don't store it.