5 files changed, 33 insertions, 3 deletions
diff --git a/web-ui/app/templates/compose/compose_box.hbs b/web-ui/app/templates/compose/compose_box.hbs
index d5501e69..2a1d27b0 100644
--- a/web-ui/app/templates/compose/compose_box.hbs
+++ b/web-ui/app/templates/compose/compose_box.hbs
@@ -1,8 +1,14 @@
 <button class="close-mail-button">
   <i class="fa fa-times"></i>
 </button>
-<input type="text" id="subject" value="{{subject}}" placeholder="{{t 'Subject'}}" tabindex="1"/>
-<textarea id="text-box" placeholder="{{t 'Body'}}" tabindex="2">{{body}}</textarea>
+<div class="floatlabel">
+  <label class="floatlabel" for="subject">Subject</label>
+  <input class="floatlabel" name="subject" type="text" id="subject" value="{{subject}}" placeholder="{{t 'Subject'}}" tabindex="1"/>
+</div>
+<div class="floatlabel">
+  <label class="floatlabel" for="body">Body</label>
+  <textarea class="floatlabel" name="body" id="text-box" placeholder="{{t 'Body'}}" tabindex="2">{{body}}</textarea>
+</div>
 
 {{> recipients }}
 
diff --git a/web-ui/app/templates/compose/feedback_box.hbs b/web-ui/app/templates/compose/feedback_box.hbs
new file mode 100644
index 00000000..ab5b3018
--- /dev/null
+++ b/web-ui/app/templates/compose/feedback_box.hbs
@@ -0,0 +1,15 @@
+<button class="close-mail-button">
+  <i class="fa fa-times"></i>
+</button>
+<div class="floatlabel">
+  <span id="feedback-subject">Feedback</span>
+</div>
+<div class="floatlabel">
+  <label class="floatlabel" for="text-box">Body</label>
+  <textarea class="floatlabel" name="body" id="text-box" placeholder="{{t 'feedback-placeholder'}}" tabindex="2">{{body}}</textarea>
+</div>
+
+
+<div class="buttons-group columns">
+  <button id="send-button" tabindex="6">{{t 'Submit Feedback'}} </button>
+</div>
diff --git a/web-ui/app/templates/feedback/feedback_trigger.hbs b/web-ui/app/templates/feedback/feedback_trigger.hbs
new file mode 100644
index 00000000..7f3f8ef1
--- /dev/null
+++ b/web-ui/app/templates/feedback/feedback_trigger.hbs
@@ -0,0 +1,8 @@
+<ul id="feedback">
+    <a title="Feedback" href="#">
+    	<li>
+            <div class="fa fa-exclamation-circle"></div>
+            <i class="shortcut-label"></i> Feedback
+        </li>
+    </a>
+</ul>
diff --git a/web-ui/app/templates/mails/full_view.hbs b/web-ui/app/templates/mails/full_view.hbs
index 77994860..0383b821 100644
--- a/web-ui/app/templates/mails/full_view.hbs
+++ b/web-ui/app/templates/mails/full_view.hbs
@@ -36,7 +36,7 @@
         <div class="recipients column large-2 text-right">
             <span class="received-date">{{ formatDate header.date }}</span>
         </div>
-        <div>
+        <div class="headline-area">
             <h3 class="subjectArea column large-10 no-padding">
                 <span class="subject">{{ header.subject }}</span>
 
diff --git a/web-ui/app/templates/page/version.hbs b/web-ui/app/templates/page/version.hbs
new file mode 100644
index 00000000..40804ff3
--- /dev/null
+++ b/web-ui/app/templates/page/version.hbs
@@ -0,0 +1 @@
+version: UNKNOWN_VERSION
+\ No newline at end of file