diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 0791ec55dbd..e4dc398acf5 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -6,6 +6,8 @@ import { default as computed, observes } from 'ember-addons/ember-computed-decor
 import { relativeAge } from 'discourse/lib/formatter';
 import InputValidation from 'discourse/models/input-validation';
 import { getOwner } from 'discourse-common/lib/get-owner';
+import { escapeExpression } from 'discourse/lib/utilities';
+import { emojiUnescape } from 'discourse/lib/text';
 
 function loadDraft(store, opts) {
   opts = opts || {};
@@ -195,6 +197,11 @@ export default Ember.Controller.extend({
     return this.get('model.creatingPrivateMessage');
   }.property('model.creatingPrivateMessage', 'model.targetUsernames'),
 
+  @computed('model.topic')
+  draftTitle(topic) {
+    return emojiUnescape(escapeExpression(topic.get('title')));
+  },
+
   actions: {
 
     typed() {
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index bf40be927c1..bc86c2d501e 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -135,7 +135,11 @@
                 {{/if}}
               </div>
               <div class='draft-text'>
-                {{i18n 'composer.saved_draft'}}
+                {{#if model.topic}}
+                  {{fa-icon "reply"}} {{{draftTitle}}}
+                {{else}}
+                  {{i18n "composer.saved_draft"}}
+                {{/if}}
               </div>
             </div>
           </div>
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index f4b149a618d..0ee62ead225 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -99,6 +99,10 @@ input {
       display: block;
           position: absolute;
           margin-right: 40px;
+          max-width: 80%;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
     }
     .toggler {
       &:before {