diff --git a/internal_packages/composer/lib/composer-view.cjsx b/internal_packages/composer/lib/composer-view.cjsx
index c120aea07..d86eacdbe 100644
--- a/internal_packages/composer/lib/composer-view.cjsx
+++ b/internal_packages/composer/lib/composer-view.cjsx
@@ -497,7 +497,8 @@ class ComposerView extends React.Component
     draft = @_proxy.draft()
     if _.isEmpty(draft.subject ? "") then return true
     else if @isForwardedMessage() then return true
-    else return false
+    else if draft.replyToMessageId then return false
+    else return true
 
   _shouldAcceptDrop: (event) =>
     # Ensure that you can't pick up a file and drop it on the same draft
diff --git a/internal_packages/composer/spec/composer-view-spec.cjsx b/internal_packages/composer/spec/composer-view-spec.cjsx
index 4dcb15e36..14e2a0419 100644
--- a/internal_packages/composer/spec/composer-view-spec.cjsx
+++ b/internal_packages/composer/spec/composer-view-spec.cjsx
@@ -246,15 +246,15 @@ describe "populated composer", ->
       makeComposer.call @
       expect(@composer._shouldShowSubject()).toBe true
 
-    it "doesn't show subject when subject has fwd text in it", ->
-      useDraft.call @, subject: "Trick fwd"
+    it "doesn't show subject when replyToMessageId exists", ->
+      useDraft.call @, subject: "should hide", replyToMessageId: "some-id"
       makeComposer.call @
       expect(@composer._shouldShowSubject()).toBe false
 
-    it "doesn't show the subject otherwise", ->
+    it "shows the subject otherwise", ->
       useDraft.call @, subject: "Foo bar baz"
       makeComposer.call @
-      expect(@composer._shouldShowSubject()).toBe false
+      expect(@composer._shouldShowSubject()).toBe true
 
   describe "when deciding whether or not to show cc and bcc", ->
     it "doesn't show cc when there's no one to cc", ->