diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/TwidereConstants.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/TwidereConstants.java
index fa671c6ad..8762de827 100644
--- a/twidere.component.common/src/main/java/org/mariotaku/twidere/TwidereConstants.java
+++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/TwidereConstants.java
@@ -97,7 +97,6 @@ public interface TwidereConstants extends SharedPreferenceConstants, IntentConst
     String AUTHORITY_MESSAGES = "direct_messages";
     String AUTHORITY_SEARCH = "search";
     String AUTHORITY_MAP = "map";
-    String AUTHORITY_SCHEDULED_STATUSES = "scheduled_statuses";
     String AUTHORITY_USER_LIST = "user_list";
     String AUTHORITY_USER_LIST_TIMELINE = "user_list_timeline";
     String AUTHORITY_GROUP = "group";
diff --git a/twidere/src/main/java/org/mariotaku/twidere/Constants.java b/twidere/src/main/java/org/mariotaku/twidere/Constants.java
index af6cc4ae8..34efdd8d3 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/Constants.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/Constants.java
@@ -80,7 +80,6 @@ public interface Constants extends TwidereConstants {
     int LINK_ID_PUBLIC_TIMELINE = 36;
     int LINK_ID_MUTES_USERS = 41;
     int LINK_ID_MAP = 51;
-    int LINK_ID_SCHEDULED_STATUSES = 61;
     int LINK_ID_ACCOUNTS = 101;
     int LINK_ID_DRAFTS = 102;
     int LINK_ID_FILTERS = 110;
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt
index b4d6675ec..8feef5154 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt
@@ -442,9 +442,6 @@ class LinkHandlerActivity : BaseActivity(), SystemWindowsInsetsCallback, IContro
             LINK_ID_PROFILE_EDITOR -> {
                 setTitle(R.string.title_edit_profile)
             }
-            LINK_ID_SCHEDULED_STATUSES -> {
-                title = getString(R.string.scheduled_statuses)
-            }
             LINK_ID_MESSAGES -> {
                 title = getString(R.string.title_direct_messages)
             }
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt
index 622338914..6a90cd98a 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt
@@ -1057,10 +1057,6 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
                 IntentUtils.openSavedSearches(context, user.account_key)
                 return true
             }
-            R.id.scheduled_statuses -> {
-                IntentUtils.openScheduledStatuses(context, user.account_key)
-                return true
-            }
             R.id.open_in_browser -> {
                 val uri = LinkCreator.getUserWebLink(user)
                 val intent = Intent(Intent.ACTION_VIEW, uri)
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/IntentUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/IntentUtils.kt
index 1a79e90c2..7e1b8751f 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/IntentUtils.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/IntentUtils.kt
@@ -330,19 +330,6 @@ object IntentUtils {
         context.startActivity(intent)
     }
 
-    fun openScheduledStatuses(context: Context,
-            accountKey: UserKey?) {
-        val builder = Uri.Builder()
-        builder.scheme(SCHEME_TWIDERE)
-        builder.authority(AUTHORITY_SCHEDULED_STATUSES)
-        if (accountKey != null) {
-            builder.appendQueryParameter(QUERY_PARAM_ACCOUNT_KEY, accountKey.toString())
-        }
-        val intent = Intent(Intent.ACTION_VIEW, builder.build())
-        intent.`package` = BuildConfig.APPLICATION_ID
-        context.startActivity(intent)
-    }
-
     fun openSavedSearches(context: Context, accountKey: UserKey?) {
         val builder = Uri.Builder()
         builder.scheme(SCHEME_TWIDERE)
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/linkhandler/TwidereLinkMatcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/linkhandler/TwidereLinkMatcher.kt
index 4b8277eae..850746e3b 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/linkhandler/TwidereLinkMatcher.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/linkhandler/TwidereLinkMatcher.kt
@@ -41,7 +41,6 @@ object TwidereLinkMatcher {
         addURI(AUTHORITY_SEARCH, null, LINK_ID_SEARCH)
         addURI(AUTHORITY_MUTES_USERS, null, LINK_ID_MUTES_USERS)
         addURI(AUTHORITY_MAP, null, LINK_ID_MAP)
-        addURI(AUTHORITY_SCHEDULED_STATUSES, null, LINK_ID_SCHEDULED_STATUSES)
 
         addURI(AUTHORITY_ACCOUNTS, null, LINK_ID_ACCOUNTS)
         addURI(AUTHORITY_DRAFTS, null, LINK_ID_DRAFTS)
diff --git a/twidere/src/main/res/menu/menu_user_profile.xml b/twidere/src/main/res/menu/menu_user_profile.xml
index 2f57498f8..f0f6ea4e9 100644
--- a/twidere/src/main/res/menu/menu_user_profile.xml
+++ b/twidere/src/main/res/menu/menu_user_profile.xml
@@ -36,12 +36,6 @@
         android:id="@+id/saved_searches"
         android:icon="@drawable/ic_action_search"
         android:title="@string/saved_searches"/>
-    <item
-        android:id="@+id/scheduled_statuses"
-        android:enabled="false"
-        android:icon="@drawable/ic_action_time"
-        android:title="@string/scheduled_statuses"
-        android:visible="false"/>
     <item
         android:id="@+id/enable_notifications"
         android:checkable="true"
diff --git a/twidere/src/main/res/values/strings.xml b/twidere/src/main/res/values/strings.xml
index 722b12b0d..b636fe0e1 100644
--- a/twidere/src/main/res/values/strings.xml
+++ b/twidere/src/main/res/values/strings.xml
@@ -27,7 +27,7 @@
     <string name="action_blocking">blocking</string>
     <string name="action_buffer_disconnect">Disconnect from Buffer</string>
     <string name="action_buffer_settings">Settings</string>
-    <string name="action_buffer_update_now">Update now</string>
+    <string name="action_buffer_update_now">Publish now</string>
     <!-- [verb] Action for cancelling (deleting) a retweet-->
     <string name="action_cancel_retweet">Cancel retweet</string>
     <string name="action_cancelling_like">cancelling like</string>
@@ -639,7 +639,6 @@
     <string name="message_toast_added_to_filter">Added to filter</string>
     <string name="message_toast_added_user_to_list">Added <xliff:g id="user">%1$s</xliff:g> to list \"<xliff:g id="list">%2$s</xliff:g>\"</string>
     <string name="message_toast_already_logged_in">You have already logged in</string>
-    <string name="message_toast_buffer_connection_failed">Unable to communicate with Buffer</string>
     <string name="message_toast_cannot_get_location">Can\'t get your location</string>
     <string name="message_toast_compose_write_storage_no_permission">Permission required to delete taken photo/video</string>
     <string name="message_toast_duplicate_filter_rule">Rule duplicated</string>