diff --git a/src/app/components/create-status/create-status.component.html b/src/app/components/create-status/create-status.component.html
index af6e7ffc..65f2162a 100644
--- a/src/app/components/create-status/create-status.component.html
+++ b/src/app/components/create-status/create-status.component.html
@@ -3,9 +3,10 @@
         <app-waiting-animation class="waiting-icon status-form__sending--waiting"></app-waiting-animation>
     </div>
 
-    <input [(ngModel)]="title" type="text" class="form-control form-control-sm" name="title" autocomplete="off" placeholder="Title, Content Warning (optional)" />
+    <input [(ngModel)]="title" type="text" class="form-control form-control-sm" name="title" autocomplete="off" placeholder="Title, Content Warning (optional)" title="title, content warning (optional)"/>
 
-    <textarea #reply [(ngModel)]="status" name="status" class="form-control form-control-sm" rows="5" required
+    <textarea #reply [(ngModel)]="status" name="status" class="form-control form-control-sm" 
+        rows="5" required title="content"
         placeholder="What's in your mind?" (keydown.control.enter)="onCtrlEnter()"></textarea>
 
     <select class="form-control form-control-sm form-control--privacy" id="privacy" name="privacy"
diff --git a/src/app/components/create-status/create-status.component.ts b/src/app/components/create-status/create-status.component.ts
index b6df20de..151a99a0 100644
--- a/src/app/components/create-status/create-status.component.ts
+++ b/src/app/components/create-status/create-status.component.ts
@@ -41,11 +41,13 @@ export class CreateStatusComponent implements OnInit {
             } else {
                 this.statusReplyingTo = this.statusReplyingToWrapper.status;
             }
-            
+
             const uniqueMentions = this.getMentions(this.statusReplyingTo, this.statusReplyingToWrapper.provider);
             for (const mention of uniqueMentions) {
                 this.status += `@${mention} `;
             }
+
+            this.title = this.statusReplyingTo.spoiler_text;
         }
 
         setTimeout(() => {
@@ -53,19 +55,19 @@ export class CreateStatusComponent implements OnInit {
         }, 0);
     }
 
-    private getMentions(status: Status, providerInfo: AccountInfo): string[]{
+    private getMentions(status: Status, providerInfo: AccountInfo): string[] {
         const mentions = [...status.mentions.map(x => x.acct), status.account.acct];
 
         let uniqueMentions = [];
-        for(let mention of mentions){
-            if(!uniqueMentions.includes(mention)){               
+        for (let mention of mentions) {
+            if (!uniqueMentions.includes(mention)) {
                 uniqueMentions.push(mention);
             }
         }
 
         let globalUniqueMentions = [];
-        for(let mention of uniqueMentions){
-            if(!mention.includes('@')){
+        for (let mention of uniqueMentions) {
+            if (!mention.includes('@')) {
                 mention += `@${providerInfo.instance}`;
             }
             globalUniqueMentions.push(mention);
@@ -75,7 +77,7 @@ export class CreateStatusComponent implements OnInit {
     }
 
     onSubmit(): boolean {
-        if(this.isSending) return false;
+        if (this.isSending) return false;
 
         this.isSending = true;
 
@@ -96,9 +98,7 @@ export class CreateStatusComponent implements OnInit {
         }
 
         let spoiler = this.title;
-        if (this.statusReplyingToWrapper) {
-            spoiler = this.statusReplyingTo.spoiler_text;
-        }
+
 
         const acc = this.toolsService.getSelectedAccounts()[0];