diff --git a/internal_packages/composer/lib/composer-view.cjsx b/internal_packages/composer/lib/composer-view.cjsx
index 154761d10..48d8ffbd3 100644
--- a/internal_packages/composer/lib/composer-view.cjsx
+++ b/internal_packages/composer/lib/composer-view.cjsx
@@ -176,11 +176,11 @@ ComposerView = React.createClass
                  key="subject"
                  name="subject"
                  tabIndex="108"
+                 placeholder="Subject:"
                  disabled={not @state.showsubject}
                  className="compose-field compose-subject"
                  value={@state.subject}
                  onChange={@_onChangeSubject}/>
-          <div className="subject-label">Subject:</div>
         </div>
 
         <div className="compose-body">
diff --git a/internal_packages/composer/stylesheets/composer.less b/internal_packages/composer/stylesheets/composer.less
index 254e37066..94bf45481 100644
--- a/internal_packages/composer/stylesheets/composer.less
+++ b/internal_packages/composer/stylesheets/composer.less
@@ -123,6 +123,12 @@
       background-color: transparent;
       border: none;
     }
+    input.compose-field.compose-subject {
+      &::-webkit-input-placeholder {
+        color: @text-color-very-subtle;
+      }
+      margin-left: 0;
+    }
   }
 
   .compose-body {
diff --git a/internal_packages/message-list/lib/message-participants.cjsx b/internal_packages/message-list/lib/message-participants.cjsx
index dde6a9274..f8cb57cd8 100644
--- a/internal_packages/message-list/lib/message-participants.cjsx
+++ b/internal_packages/message-list/lib/message-participants.cjsx
@@ -42,11 +42,6 @@ MessageParticipants = React.createClass
         <div className="participant-name to-contact">{@_fullContact(@props.to)}</div>
       </div>
 
-      <div className="participant-type">
-        <div className="subject-label">Subject:&nbsp;</div>
-        <div className="subject">{@props.subject}</div>
-      </div>
-
       <div className="participant-type"
            style={if @props.cc?.length > 0 then display:"block" else display:"none"}>
         <div className="participant-label cc-label">Cc:&nbsp;</div>
@@ -58,6 +53,12 @@ MessageParticipants = React.createClass
         <div className="participant-label bcc-label">Bcc:&nbsp;</div>
         <div className="participant-name cc-contact">{@_fullContact(@props.bcc)}</div>
       </div>
+
+      <div className="participant-type">
+        <div className="subject-label">Subject:&nbsp;</div>
+        <div className="subject">{@props.subject}</div>
+      </div>
+
     </div>
 
   _shortNames: (contacts=[]) ->