diff --git a/client/client.coffee b/client/client.coffee
index 7fb2b9d..660dc62 100644
--- a/client/client.coffee
+++ b/client/client.coffee
@@ -150,6 +150,7 @@ Template.archivedlist.events =
 
 # Note Editor
 Template.editor.note = -> Router.current().data()
+Template.editor.dateformat = -> getUser().dateformat
 Template.editor.formattedDate = ->
   return unless @date
   moment.unix(@date).format(getUser().dateformat)
diff --git a/client/view/style.css b/client/view/style.css
index acd44b5..3737503 100644
--- a/client/view/style.css
+++ b/client/view/style.css
@@ -73,6 +73,14 @@ input {
 .note-date{
   float:right;
 }
+
+/* firefox specific fix */
+@-moz-document url-prefix() {
+  .note-date{
+    margin-top: -17px;
+  }
+}
+
 .note-desc {
   color: #999;
 }
diff --git a/client/view/templates.html b/client/view/templates.html
index d06d70e..e860df9 100644
--- a/client/view/templates.html
+++ b/client/view/templates.html
@@ -90,7 +90,7 @@
     </div>
     <div align="center" class="panel-body">
       <textarea id="area" class="area form-control in-bt" rows="3" placeholder="...">{{content}}</textarea>
-      <input class="form-control date" value="{{formattedDate}}" placeholder="Due Date">
+      <input class="form-control date" value="{{formattedDate}}" placeholder="Due Date ({{dateformat}})">
       <button type="button" class="btn btn-warning set-date">
         <i class="fa fa-clock-o"></i> Do Today</button>
       <button type="button" class="btn btn-info save-editor">