diff --git a/frontend_tests/casper_tests/03-narrow.js b/frontend_tests/casper_tests/03-narrow.js
index 4a68ada124..b7272a7ea3 100644
--- a/frontend_tests/casper_tests/03-narrow.js
+++ b/frontend_tests/casper_tests/03-narrow.js
@@ -180,7 +180,7 @@ function search_silent_user(str, item) {
         casper.waitUntilVisible('#silent_user', function () {
             casper.test.info("Empty feed for silent user visible.");
             var expected_message = "\n        You haven't received any messages sent by this user yet!"+
-                                    "\n      ";
+                                    "\n    ";
             this.test.assertEquals(casper.fetchText('#silent_user'), expected_message);
         });
     });
@@ -193,7 +193,7 @@ function search_non_existing_user(str, item) {
         casper.waitUntilVisible('#non_existing_user', function () {
             casper.test.info("Empty feed for non existing user visible.");
             var expected_message = "\n        This user does not exist!"+
-                                    "\n      ";
+                                    "\n    ";
             this.test.assertEquals(casper.fetchText('#non_existing_user'), expected_message);
         });
     });
diff --git a/templates/zerver/home.html b/templates/zerver/home.html
index 504feb9af6..ed6bb06961 100644
--- a/templates/zerver/home.html
+++ b/templates/zerver/home.html
@@ -1,114 +1,134 @@
 {# Home tab of the app, containing messages. #}
-    <div class="message_area_padder message_list" id="main_div">
-      <div class="top-messages-logo">
-          <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40 40" version="1.1">
-              <g transform="translate(-297.14285,-466.64792)">
-              <circle cx="317.14285" cy="486.64792" r="19.030317" style="fill:#444;stroke-width:1.93936479;stroke:#444"/>
-              <path d="m309.24286 477.14791 14.2 0 1.6 3.9-11.2 11.9 9.6 0 1.6 3.2-14.2 0-1.6-3.9 11.2-11.9-9.6 0z" style="fill:#fff;stroke:#fff"/>
-              </g>
-          </svg>
-      </div>
-      <div id="loading_more_messages_indicator"></div>
-      <div id="page_loading_indicator"></div>
-      <div id="first_run_message" class="empty_feed_notice">
+<div class="message_area_padder message_list" id="main_div">
+    <div class="top-messages-logo">
+        <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40 40" version="1.1">
+            <g transform="translate(-297.14285,-466.64792)">
+                <circle cx="317.14285" cy="486.64792" r="19.030317" style="fill:#444;stroke-width:1.93936479;stroke:#444"/>
+                <path d="m309.24286 477.14791 14.2 0 1.6 3.9-11.2 11.9 9.6 0 1.6 3.2-14.2 0-1.6-3.9 11.2-11.9-9.6 0z" style="fill:#fff;stroke:#fff"/>
+            </g>
+        </svg>
+    </div>
+    <div id="loading_more_messages_indicator"></div>
+    <div id="page_loading_indicator"></div>
+    <div id="first_run_message" class="empty_feed_notice">
         <h4>{% trans %}Welcome to Zulip.{% endtrans %}</h4>
-        {% trans %}
-        <p>See, the thing about it is... there aren't any messages
-        here for you right now. I'm sure someone will eventually send
-        you one.</p>
+        <p>
+            {% trans %}
+            See, the thing about it is... there aren't any messages
+            here for you right now. I'm sure someone will eventually send
+            you one.
+            {% endtrans %}
+        </p>
 
-        <p>Or, <strong>take matters into your own hands</strong>,
-        and <a href="#" class="empty_feed_compose_stream">
-        compose a new stream message</a>.</p>
-        {% endtrans %}
-      </div>
-      <div id="empty_narrow_message" class="empty_feed_notice">
+        <p>
+            {% trans %}
+            Or, <strong>take matters into your own hands</strong>,
+            and <a href="#" class="empty_feed_compose_stream">
+            compose a new stream message</a>.
+            {% endtrans %}
+        </p>
+    </div>
+    <div id="empty_narrow_message" class="empty_feed_notice">
         <h4>{{ _("Nothing's been sent here yet!") }}</h4>
 
-        {% trans %}
-        <p>Why not <a href="#" class="empty_feed_compose_stream">
-            start the conversation</a>?</p>
-        {% endtrans %}
-      </div>
-      <div id="empty_narrow_all_private_message" class="empty_feed_notice">
+        <p>
+            {% trans %}
+            Why not <a href="#" class="empty_feed_compose_stream">
+            start the conversation</a>?
+            {% endtrans %}
+        </p>
+    </div>
+    <div id="empty_narrow_all_private_message" class="empty_feed_notice">
         <h4>{{ _('You have no private messages yet!') }}</h4>
 
-        {% trans %}
-        <p>Why not <a href="#" class="empty_feed_compose_private">
-            start the conversation</a>?</p>
-        {% endtrans %}
-      </div>
-      <div id="empty_narrow_private_message" class="empty_feed_notice">
+        <p>
+            {% trans %}
+            Why not <a href="#" class="empty_feed_compose_private">
+            start the conversation</a>?
+            {% endtrans %}
+        </p>
+    </div>
+    <div id="empty_narrow_private_message" class="empty_feed_notice">
         <h4>{{ _('You have no private messages with this person yet!') }}</h4>
 
-        {% trans %}
-        <p>Why not <a href="#" class="empty_feed_compose_private">
-            start the conversation</a>?</p>
-        {% endtrans %}
-      </div>
-      <div id="empty_narrow_group_private_message" class="empty_feed_notice">
+        <p>
+            {% trans %}
+            Why not <a href="#" class="empty_feed_compose_private">
+            start the conversation</a>?
+            {% endtrans %}
+        </p>
+    </div>
+    <div id="empty_narrow_group_private_message" class="empty_feed_notice">
         <h4>{{ _('You have no group private messages with this person yet!') }}</h4>
 
-        {% trans %}
-        <p>Why not <a href="#" class="empty_feed_compose_private">
-            start the conversation</a>?</p>
-        {% endtrans %}
-      </div>
-      <div id="empty_narrow_multi_private_message" class="empty_feed_notice">
+        <p>
+            {% trans %}
+            Why not <a href="#" class="empty_feed_compose_private">
+            start the conversation</a>?
+            {% endtrans %}
+        </p>
+    </div>
+    <div id="empty_narrow_multi_private_message" class="empty_feed_notice">
         <h4>{{ _('You have no private messages with these people yet!') }}</h4>
 
-        {% trans %}
-        <p>Why not <a href="#" class="empty_feed_compose_private">
-            start the conversation</a>?</p>
-        {% endtrans %}
-      </div>
-      <div id="silent_user" class="empty_feed_notice">
+        <p>
+            {% trans %}
+            Why not <a href="#" class="empty_feed_compose_private">
+            start the conversation</a>?
+            {% endtrans %}
+        </p>
+    </div>
+    <div id="silent_user" class="empty_feed_notice">
         <h4>{{ _("You haven't received any messages sent by this user yet!") }}</h4>
-      </div>
-      <div id="non_existing_user" class="empty_feed_notice">
+    </div>
+    <div id="non_existing_user" class="empty_feed_notice">
         <h4>{{ _("This user does not exist!") }}</h4>
-      </div>
-      <div id="nonsubbed_stream_narrow_message" class="empty_feed_notice">
+    </div>
+    <div id="nonsubbed_stream_narrow_message" class="empty_feed_notice">
         <h4>{{ _("You aren't subscribed to this stream and nobody has talked about that yet!") }}</h4>
         <div class="sub_button_row">
-          <button class="btn empty_feed_sub_unsub btn-default" type="button" name="subscription">
-            {{ _('Subscribe') }}
-          </button>
+            <button class="btn empty_feed_sub_unsub btn-default" type="button" name="subscription">
+                {{ _('Subscribe') }}
+            </button>
         </div>
-      </div>
-      <div id="nonsubbed_private_nonexistent_stream_narrow_message" class="empty_feed_notice">
+    </div>
+    <div id="nonsubbed_private_nonexistent_stream_narrow_message" class="empty_feed_notice">
         <h4>{{ _("You are not subscribed to this stream.") }}</h4>
-      </div>
-      <div id="empty_star_narrow_message" class="empty_feed_notice">
+    </div>
+    <div id="empty_star_narrow_message" class="empty_feed_notice">
         <h4>{{ _("You haven't starred anything yet!") }}</h4>
 
-        {% trans %}
-        <p>Learn more about starring messages at <a href="/help/star-a-message">
-           {{ realm_uri }}/help/star-a-message</a>.</p>
-        {% endtrans %}
-      </div>
-      <div id="no_unread_narrow_message" class="empty_feed_notice">
+        <p>
+            {% trans %}
+            Learn more about starring messages at <a href="/help/star-a-message">
+            {{ realm_uri }}/help/star-a-message</a>.
+            {% endtrans %}
+        </p>
+    </div>
+    <div id="no_unread_narrow_message" class="empty_feed_notice">
         <h4>{{ _("You have no unread messages!") }}</h4>
-      </div>
-      <div id="empty_narrow_all_mentioned" class="empty_feed_notice">
+    </div>
+    <div id="empty_narrow_all_mentioned" class="empty_feed_notice">
         <h4>{{ _("You haven't been mentioned yet!") }}</h4>
 
-        {% trans %}
-        <p>Learn more about mentions at <a href="/help/at-mention-a-team-member">
-           {{ realm_uri }}/help/at-mention-a-team-member</a>.</p>
-        {% endtrans %}
-      </div>
-      <div id="empty_search_narrow_message" class="empty_feed_notice">
-        <h4>{{ _('Nobody has talked about that yet!') }}</h4>
-      </div>
-      <div class="message_table focused_table" id="zhome">
-      </div>
-      <div class="message_table" id="zfilt">
-      </div>
-      <div id="typing_notifications">
-      </div>
-      <div id="bottom_whitespace"></div>
+        <p>
+            {% trans %}
+            Learn more about mentions at <a href="/help/at-mention-a-team-member">
+            {{ realm_uri }}/help/at-mention-a-team-member</a>.
+            {% endtrans %}
+        </p>
     </div>
+    <div id="empty_search_narrow_message" class="empty_feed_notice">
+        <h4>{{ _('Nobody has talked about that yet!') }}</h4>
+    </div>
+    <div class="message_table focused_table" id="zhome">
+    </div>
+    <div class="message_table" id="zfilt">
+    </div>
+    <div id="typing_notifications">
+    </div>
+    <div id="bottom_whitespace"></div>
+</div>
 
 
 {% include "zerver/message_history.html" %}
diff --git a/tools/check-templates b/tools/check-templates
index e8f9390866..f95770d599 100755
--- a/tools/check-templates
+++ b/tools/check-templates
@@ -101,7 +101,6 @@ def check_html_templates(templates, all_dups):
             'templates/zerver/api_endpoints.html',
             # These just need to be reindented
             'templates/zerver/features.html',
-            'templates/zerver/home.html',
             'templates/zerver/login.html',
             # Can't clean this because of `preserve_spaces`
             'templates/zerver/markdown_help.html',
@@ -117,7 +116,6 @@ def check_html_templates(templates, all_dups):
         'templates/zerver/api.html',
         'templates/zerver/compose.html',
         'templates/zerver/hello.html',
-        'templates/zerver/home.html',
         'templates/zerver/index.html',
         'templates/zerver/keyboard_shortcuts.html',
         'templates/zerver/login.html',