diff --git a/index.html b/index.html
index 5b29462..9f28055 100644
--- a/index.html
+++ b/index.html
@@ -149,6 +149,16 @@
                       </div>
                     </form>
                   </li>
+                  <li class="">
+                    <form class="form-inline" role="form">
+                      <div class="checkbox">
+                        <label>
+                          <input type="checkbox" ng-model="notimestamp">
+                         Hide timestamps 
+                        </label>
+                      </div>
+                    </form>
+                  </li>
                 </ul>
               </div>
               <a ng-click="disconnect()">
@@ -176,7 +186,7 @@
         <table>
           <tbody>
             <tr class="bufferline" ng-repeat-start="bufferline in activeBuffer().lines">
-              <td class="time">
+              <td ng-hide="notimestamp" class="time">
                 <span class="date text-muted">
                   {{ bufferline.date | date:'HH:mm' }}
                 </span>
diff --git a/js/websockets.js b/js/websockets.js
index d5578f7..a345d60 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -332,7 +332,10 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     // $scope.password = "";
     //
 
+    // Save setting for displaying only buffers with unread messages
     $store.bind($scope, "onlyUnread", false);
+    // Save setting for not showing timestamp
+    $store.bind($scope, "notimestamp", false);
 
 
     $scope.setActiveBuffer = function(key) {