1 files changed, 8 insertions, 1 deletions
diff --git a/assets/script.js b/assets/script.js
index e957d2d82..cd3045e03 100644
--- a/assets/script.js
+++ b/assets/script.js
@@ -576,6 +576,10 @@ function restoreScrollPosition() {
 }
 
 function onContentReady(event) {
+    // hack for b/1333356
+    if (RUNNING_KITKAT_OR_LATER) {
+        restoreScrollPosition();
+    }
     window.mail.onContentReady();
 }
 
@@ -779,6 +783,9 @@ collapseAllQuotedText();
 hideAllUnsafeImages();
 normalizeAllMessageWidths();
 //setWideViewport();
-restoreScrollPosition();
+// hack for b/1333356
+if (!RUNNING_KITKAT_OR_LATER) {
+    restoreScrollPosition();
+}
 measurePositions();