diff --git a/templates/zephyr/home.html b/templates/zephyr/home.html
index 779c9c70fe..51af93feb1 100644
--- a/templates/zephyr/home.html
+++ b/templates/zephyr/home.html
@@ -31,10 +31,11 @@
 <div class="row">
   <div class="span9">
     <div class="message_list" id="main_div">
+      <div id="top_whitespace"></div>
+      <button type="button" class="btn btn-large btn-block" id="load_more">Load more messages</button>
       <table id="loading_indicator">
         <tr><td id="loading_spinner"></td><td>Loading...</td></tr>
       </table>
-      <div id="top_whitespace"></div>
       <table class="message_table focused_table" id="zhome">
         <tbody>
         </tbody>
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 839844dcee..f294192e2d 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -481,6 +481,8 @@ function add_messages(data) {
         loading_spinner.stop();
         $('#loading_indicator').hide();
         loading_spinner = undefined;
+
+        $('#load_more').show();
     }
 
     if (data.where === 'top') {
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index a4f33634c2..5278ddb045 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -55,6 +55,11 @@ ul#sidebar {
     margin-top: 5px;
 }
 
+#load_more {
+    margin-bottom: 35px;
+    display: none;
+}
+
 #application_area {
 }