Merge remote-tracking branch 'origin/develop' into rav/no_resume_client_on_login

src/components/structures/ScrollPanel.js

@@ -352,13 +352,14 @@ module.exports = React.createClass({
             const tile = tiles[backwards ? i : tiles.length - 1 - i];
             // Subtract height of tile as if it were unpaginated
             excessHeight -= tile.clientHeight;
+            //If removing the tile would lead to future pagination, break before setting scroll token
+            if (tile.clientHeight > excessHeight) {
+                break;
+            }
             // The tile may not have a scroll token, so guard it
             if (tile.dataset.scrollTokens) {
                 markerScrollToken = tile.dataset.scrollTokens.split(',')[0];
             }
-            if (tile.clientHeight > excessHeight) {
-                break;
-            }
         }
 
         if (markerScrollToken) {

src/components/views/dialogs/SetEmailDialog.js

@@ -14,15 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import q from 'q';
 import React from 'react';
 import sdk from '../../../index';
-import MatrixClientPeg from '../../../MatrixClientPeg';
-import classnames from 'classnames';
-import KeyCode from '../../../KeyCode';
 import Email from '../../../email';
 import AddThreepid from '../../../AddThreepid';
-import { _t, _tJsx } from '../../../languageHandler';
+import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';