diff --git a/.eslintrc.js b/.eslintrc.js
index 12a8003a..4868f360 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -22,6 +22,7 @@ module.exports = {
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
     'vue/require-prop-types': 0,
-    'vue/no-unused-vars': 0
+    'vue/no-unused-vars': 0,
+    'no-tabs': 0
   }
 }
diff --git a/src/components/mention_link/mention_link.scss b/src/components/mention_link/mention_link.scss
index ec2689f8..557a0252 100644
--- a/src/components/mention_link/mention_link.scss
+++ b/src/components/mention_link/mention_link.scss
@@ -40,7 +40,7 @@
     &.-you {
       & .shortName,
       & .full {
-        font-weight: 600;
+        //font-weight: 600;
       }
     }
 
diff --git a/src/components/mention_link/mention_link.vue b/src/components/mention_link/mention_link.vue
index a22b486c..87a8d6af 100644
--- a/src/components/mention_link/mention_link.vue
+++ b/src/components/mention_link/mention_link.vue
@@ -23,11 +23,7 @@
         @click.prevent="onClick"
       >
         <!-- eslint-disable vue/no-v-html -->
-        <FAIcon
-          size="sm"
-          icon="at"
-          class="at"
-        /><span class="shortName"><span
+        <span class="shortName">@<span
           class="userName"
           v-html="userName"
         /></span>
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index d4609127..74de030e 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -126,6 +126,7 @@ const PostStatusForm = {
       newStatus: {
         spoilerText: this.subject || '',
         status: statusText,
+        sensitiveIfSubject,
         nsfw: !!sensitiveByDefault,
         files: [],
         poll: {},
diff --git a/src/components/scope_selector/scope_selector.js b/src/components/scope_selector/scope_selector.js
index f04528e5..2bb3adcf 100644
--- a/src/components/scope_selector/scope_selector.js
+++ b/src/components/scope_selector/scope_selector.js
@@ -51,7 +51,7 @@ const ScopeSelector = {
         unlisted: { selected: this.currentScope === 'unlisted' },
         private: { selected: this.currentScope === 'private' },
         direct: { selected: this.currentScope === 'direct' },
-	local: { selected: this.currentScope === 'local' }
+        local: { selected: this.currentScope === 'local' }
       }
     }
   },
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 1699e9ef..00ec3641 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -298,7 +298,7 @@ const Status = {
         case 'direct':
           return 'envelope'
         case 'local':
-	  return "users"
+          return 'users'
         default:
           return 'globe'
       }