diff --git a/www/addons/coursecompletion/services/handlers.js b/www/addons/coursecompletion/services/handlers.js
index 981be8e2a25..1b7a91af849 100644
--- a/www/addons/coursecompletion/services/handlers.js
+++ b/www/addons/coursecompletion/services/handlers.js
@@ -232,6 +232,8 @@ angular.module('mm.addons.coursecompletion')
     });
     $mmEvents.on(mmCoursesEventMyCoursesRefreshed, $mmaCourseCompletionHandlers.clearCoursesNavCache);
     $mmEvents.on(mmUserEventProfileRefreshed, function(data) {
-        $mmaCourseCompletionHandlers.clearViewCompletionCache(data.courseid, data.userid);
+        if (data) {
+            $mmaCourseCompletionHandlers.clearViewCompletionCache(data.courseid, data.userid);
+        }
     });
 });
diff --git a/www/addons/grades/services/handlers.js b/www/addons/grades/services/handlers.js
index 921cde81ec7..bc9574ebaac 100644
--- a/www/addons/grades/services/handlers.js
+++ b/www/addons/grades/services/handlers.js
@@ -281,6 +281,8 @@ angular.module('mm.addons.grades')
 .run(function($mmaGradesHandlers, $mmEvents, mmCoreEventLogout, mmUserEventProfileRefreshed) {
     $mmEvents.on(mmCoreEventLogout, $mmaGradesHandlers.clearViewGradesCache);
     $mmEvents.on(mmUserEventProfileRefreshed, function(data) {
-        $mmaGradesHandlers.clearViewGradesCache(data.courseid, data.userid);
+        if (data) {
+            $mmaGradesHandlers.clearViewGradesCache(data.courseid, data.userid);
+        }
     });
 });
diff --git a/www/addons/messages/controllers/index.js b/www/addons/messages/controllers/index.js
index 3de6bb3d29c..0815cc4f722 100644
--- a/www/addons/messages/controllers/index.js
+++ b/www/addons/messages/controllers/index.js
@@ -36,7 +36,8 @@ angular.module('mm.addons.messages')
             }).then(function(user) {
                 // Verify that no other user was loaded while the async call was in progress.
                 if ($scope.userId == userId) {
-                    $scope.profileLink = user.profileimageurl;
+                    // Use a default icon if no image URL available.
+                    $scope.profileLink = user.profileimageurl || true;
                 }
             });
         }
diff --git a/www/addons/messages/templates/discussion.html b/www/addons/messages/templates/discussion.html
index 11c03889ff2..06338c4f672 100644
--- a/www/addons/messages/templates/discussion.html
+++ b/www/addons/messages/templates/discussion.html
@@ -3,7 +3,7 @@
 
     <ion-nav-buttons side="secondary">
         <a ng-if="profileLink" mm-user-link userid="{{userId}}" aria-label="{{ 'mm.user.viewprofile' | translate }}">
-            <img ng-if="profileLink && profileLink !== true" class="button mm-bar-button-image" ng-src="{{profileLink}}">
+            <img ng-if="profileLink && profileLink !== true" class="button mm-bar-button-image" ng-src="{{profileLink}}" mm-external-content>
             <span ng-if="profileLink === true" class="button button-icon icon ion-person"></span>
         </a>
     </ion-nav-buttons>
diff --git a/www/addons/messages/templates/index.html b/www/addons/messages/templates/index.html
index 8d49fbe8fc1..1d463c4eebc 100644
--- a/www/addons/messages/templates/index.html
+++ b/www/addons/messages/templates/index.html
@@ -1,7 +1,7 @@
 <ion-view view-title="{{ 'mma.messages.messages' | translate }}">
     <ion-nav-buttons side="secondary">
         <a ng-if="profileLink" mm-user-link userid="{{userId}}" aria-label="{{ 'mm.user.viewprofile' | translate }}">
-            <img ng-if="profileLink && profileLink !== true" class="button mm-bar-button-image" ng-src="{{profileLink}}">
+            <img ng-if="profileLink && profileLink !== true" class="button mm-bar-button-image" ng-src="{{profileLink}}" mm-external-content>
             <span ng-if="profileLink === true" class="button button-icon icon ion-person"></span>
         </a>
     </ion-nav-buttons>
diff --git a/www/addons/mod_chat/templates/chat.html b/www/addons/mod_chat/templates/chat.html
index 038b4688260..94b4c470eb3 100644
--- a/www/addons/mod_chat/templates/chat.html
+++ b/www/addons/mod_chat/templates/chat.html
@@ -31,10 +31,10 @@
                             <img ng-if="message.userprofileimageurl" ng-src="{{message.userprofileimageurl}}" mm-external-content alt="{{ 'mm.core.pictureof' | translate:{$a: message.userfullname} }}" role="presentation">
                             <img ng-if="!message.userprofileimageurl" src="img/user-avatar.png" alt="{{ 'mm.core.pictureof' | translate:{$a: message.userfullname} }}" role="presentation">
                             <h2>{{ message.userfullname }}</h2>
+                            <span class="item-note">{{ message.timestamp * 1000 | mmFormatDate:"dftimedate" }}</span>
 
                             <mm-format-text after-render="scrollAfterRender" watch="true">{{ message.message }}</mm-format-text>
 
-                            <span class="item-note">{{ message.timestamp * 1000 | mmFormatDate:"dftimedate" }}</span>
                         </article>
                     </div>
                 </div>
diff --git a/www/addons/mod_wiki/lang/en.json b/www/addons/mod_wiki/lang/en.json
index e9011fad026..6554396d982 100644
--- a/www/addons/mod_wiki/lang/en.json
+++ b/www/addons/mod_wiki/lang/en.json
@@ -1,6 +1,6 @@
 {
     "errorloadingpage": "An error occured while loading page.",
-    "errornowikiavailable": "There's no wiki available to be shown.",
+    "errornowikiavailable": "This wiki does not have any content yet.",
     "gowikihome": "Go Wiki home",
     "map": "Map",
     "notingroup": "Not in group",