diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsStatusesFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsStatusesFragment.java
index 47f38eebf..8b5327240 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsStatusesFragment.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsStatusesFragment.java
@@ -432,7 +432,8 @@ public abstract class AbsStatusesFragment<Data> extends BaseSupportFragment impl
     @Override
     public boolean scrollToStart() {
         saveReadPosition();
-        mRecyclerView.smoothScrollToPosition(0);
+        mLayoutManager.scrollToPositionWithOffset(0, 0);
+        setControlVisible(true);
         return true;
     }
 
diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/StatusFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/StatusFragment.java
index cc1041fd0..bb0c20b8b 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/StatusFragment.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/StatusFragment.java
@@ -645,6 +645,8 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
                 quoteTextView.setVisibility(View.VISIBLE);
                 quoteIndicator.setVisibility(View.VISIBLE);
 
+                quoteIndicator.setColor(UserColorNameUtils.getUserColor(context, status.user_id));
+
                 profileContainer.drawStart(UserColorNameUtils.getUserColor(context, status.quoted_by_user_id));
 
                 typeIconRes = getUserTypeIconRes(status.quoted_by_user_is_verified, status.quoted_by_user_is_protected);
@@ -812,6 +814,10 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
             final AsyncTwitterWrapper twitter = fragment.getTwitterWrapper();
             final FragmentActivity activity = fragment.getActivity();
             final FragmentManager fm = fragment.getFragmentManager();
+            if (item.getItemId() == MENU_RETWEET) {
+                RetweetQuoteDialogFragment.show(fm, status);
+                return true;
+            }
             return Utils.handleMenuItemClick(activity, fragment, fm, twitter, status, item);
         }
 
diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/Utils.java b/twidere/src/main/java/org/mariotaku/twidere/util/Utils.java
index d26320757..746695ba1 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/util/Utils.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/util/Utils.java
@@ -3580,11 +3580,11 @@ public final class Utils implements Constants, TwitterConstants {
             ActionIconDrawable.setMenuHighlight(retweet, new TwidereMenuInfo(isMyRetweet, retweetHighlight));
             retweet.setTitle(isMyRetweet ? R.string.cancel_retweet : R.string.retweet);
         }
-        final MenuItem retweetSubItem = menu.findItem(R.id.retweet_submenu);
-        if (retweetSubItem != null) {
-            ActionIconDrawable.setMenuHighlight(retweetSubItem, new TwidereMenuInfo(isMyRetweet,
-                    retweetHighlight));
-        }
+//        final MenuItem retweetSubItem = menu.findItem(R.id.retweet_submenu);
+//        if (retweetSubItem != null) {
+//            ActionIconDrawable.setMenuHighlight(retweetSubItem, new TwidereMenuInfo(isMyRetweet,
+//                    retweetHighlight));
+//        }
         final MenuItem favorite = menu.findItem(MENU_FAVORITE);
         if (favorite != null) {
             ActionIconDrawable.setMenuHighlight(favorite, new TwidereMenuInfo(status.is_favorite, favoriteHighlight));
diff --git a/twidere/src/main/res/menu/menu_status.xml b/twidere/src/main/res/menu/menu_status.xml
index 755a3d75d..66b12af1f 100644
--- a/twidere/src/main/res/menu/menu_status.xml
+++ b/twidere/src/main/res/menu/menu_status.xml
@@ -8,21 +8,10 @@
         android:title="@string/reply"
         app:showAsAction="always"/>
     <item
-        android:id="@+id/retweet_submenu"
+        android:id="@id/retweet"
         android:icon="@drawable/ic_action_retweet"
         android:title="@string/retweet"
-        app:showAsAction="always">
-        <menu>
-            <item
-                android:id="@id/retweet"
-                android:icon="@drawable/ic_action_retweet"
-                android:title="@string/retweet"/>
-            <item
-                android:id="@id/quote"
-                android:icon="@drawable/ic_action_quote"
-                android:title="@string/quote"/>
-        </menu>
-    </item>
+        app:showAsAction="always"/>
     <item
         android:id="@id/favorite"
         android:icon="@drawable/ic_action_star"