Merge remote-tracking branch 'origin/master' into develop

2 files changed, 4 insertions, 3 deletions

diff --git a/webclient/app.css b/webclient/app.css

index a277bd2a59..064f626f0b 100755
--- a/webclient/app.css
+++ b/webclient/app.css
@@ -529,7 +529,8 @@ a:active  { color: #000; }
 
 .bubble .message {
     /* Break lines when encountering CR+LF */
-    white-space: pre;
+    /* FIXME: this breaks wordwrapping.  We need to s#CRLF#<br/>#g instead */
+/*    white-space: pre; */
 }
 .bubble .messagePending {
     opacity: 0.3
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js

index 45dfff95c2..50d902ae47 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -220,7 +220,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
     };
 
     var paginate = function(numItems) {
-        // console.log("paginate " + numItems);
+        //console.log("paginate " + numItems + " and first_pagination is " + $scope.state.first_pagination);
         if ($scope.state.paginating || !$scope.room_id) {
             return;
         }
@@ -260,7 +260,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
                 }
                 
                 if ($scope.state.first_pagination) {
-                    scrollToBottom();
+                    scrollToBottom(true);
                     $scope.state.first_pagination = false;
                 }
                 else {