am c77916ee: Merge "Revert "Revert "always set the initial-scale""" into jb-ub-mail-ur10

* commit 'c77916eef7fadeca762e2c95752d61faea7d66b9':
  Revert "Revert "always set the initial-scale""
diff --git a/res/raw/template_conversation_upper.html b/res/raw/template_conversation_upper.html
index cd448e3..5ba3a84 100644
--- a/res/raw/template_conversation_upper.html
+++ b/res/raw/template_conversation_upper.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta id="meta-viewport" name="viewport" content="width=device-width"
+  <meta id="meta-viewport" name="viewport" content="width=device-width initial-scale=1.0"
       data-zoom-on="maximum-scale=2" data-zoom-off="user-scalable=no" />
   <style>
     .elided-text,