diff --git a/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java b/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java
index 360f8d7e4..1dae45086 100644
--- a/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java
@@ -222,6 +222,11 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
 
             });
             alt_bld.setNegativeButton(R.string.no, (dialog, id) -> {
+                try {
+                    new StatusDraft(ComposeActivity.this).removeDraft(statusDraft);
+                } catch (DBException e) {
+                    e.printStackTrace();
+                }
                 dialog.dismiss();
                 finish();
             });
diff --git a/app/src/main/java/app/fedilab/android/activities/FollowedTagActivity.java b/app/src/main/java/app/fedilab/android/activities/FollowedTagActivity.java
index 84e9e25fe..cf9c32073 100644
--- a/app/src/main/java/app/fedilab/android/activities/FollowedTagActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/FollowedTagActivity.java
@@ -145,7 +145,7 @@ public class FollowedTagActivity extends BaseActivity implements FollowedTagAdap
                                     tagList.add(0, newTag);
                                     followedTagAdapter.notifyItemInserted(0);
                                 } else {
-                                    Toasty.error(FollowedTagActivity.this, getString(R.string.toast_error), Toasty.LENGTH_LONG).show();
+                                    Toasty.error(FollowedTagActivity.this, getString(R.string.toast_feature_not_supported), Toasty.LENGTH_LONG).show();
                                 }
                             });
                     dialog.dismiss();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e2b2b1925..f6699542c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1985,4 +1985,5 @@
     <string name="follow_tag">Follow tag</string>
     <string name="action_lists_edit">Edit list</string>
     <string name="profiles">Profiles</string>
+    <string name="toast_feature_not_supported">Your instance does not seem to support that feature!</string>
 </resources>