diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
index 5421b719..e5717c99 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
@@ -49,6 +49,7 @@ import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
 import com.mikepenz.materialdrawer.model.ProfileDrawerItem;
 import com.mikepenz.materialdrawer.model.SecondaryDrawerItem;
 import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
+import com.mikepenz.materialdrawer.model.interfaces.IProfile;
 import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader;
 import com.mikepenz.materialdrawer.util.DrawerImageLoader;
 import com.squareup.picasso.Picasso;
@@ -77,6 +78,8 @@ public class MainActivity extends BaseActivity {
     @BindView(R.id.tab_layout) TabLayout tabLayout;
     @BindView(R.id.pager) ViewPager viewPager;
 
+    static FloatingActionButton composeBtn;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -176,6 +179,8 @@ public class MainActivity extends BaseActivity {
 
         // Setup push notifications
         if (arePushNotificationsEnabled()) enablePushNotifications();
+
+        composeBtn = floatingBtn;
     }
 
     @Override
@@ -208,6 +213,23 @@ public class MainActivity extends BaseActivity {
                 .withActivity(this)
                 .withSelectionListEnabledForSingleProfile(false)
                 .withDividerBelowHeader(false)
+                .withOnAccountHeaderProfileImageListener(new AccountHeader.OnAccountHeaderProfileImageListener() {
+                    @Override
+                    public boolean onProfileImageClick(View view, IProfile profile, boolean current) {
+                        if (current && loggedInAccountId != null) {
+                            Intent intent = new Intent(MainActivity.this, AccountActivity.class);
+                            intent.putExtra("id", loggedInAccountId);
+                            startActivity(intent);
+                            return true;
+                        }
+                        return false;
+                    }
+
+                    @Override
+                    public boolean onProfileImageLongClick(View view, IProfile profile, boolean current) {
+                        return false;
+                    }
+                })
                 .withCompactStyle(true)
                 .build();
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/TimelineFragment.java
index a2067734..1e9085f4 100644
--- a/app/src/main/java/com/keylesspalace/tusky/TimelineFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/TimelineFragment.java
@@ -16,9 +16,12 @@
 package com.keylesspalace.tusky;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
+import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.TabLayout;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.DividerItemDecoration;
@@ -85,7 +88,7 @@ public class TimelineFragment extends SFragment implements
             hashtagOrId = arguments.getString("hashtag_or_id");
         }
 
-        View rootView = inflater.inflate(R.layout.fragment_timeline, container, false);
+        final View rootView = inflater.inflate(R.layout.fragment_timeline, container, false);
 
         // Setup the SwipeRefreshLayout.
         Context context = getContext();
@@ -103,6 +106,20 @@ public class TimelineFragment extends SFragment implements
         divider.setDrawable(drawable);
         recyclerView.addItemDecoration(divider);
         scrollListener = new EndlessOnScrollListener(layoutManager) {
+            @Override
+            public void onScrolled(RecyclerView view, int dx, int dy) {
+                super.onScrolled(view, dx, dy);
+
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
+
+                if (dy > 0 && prefs.getBoolean("fabHide", false) && MainActivity.composeBtn.isShown()) {
+                    MainActivity.composeBtn.hide(); // hides the button if we're scrolling down
+                } else if (dy < 0 && prefs.getBoolean("fabHide", false) && !MainActivity.composeBtn.isShown()) {
+                    MainActivity.composeBtn.show(); // shows it if we are scrolling up
+                }
+
+            }
+
             @Override
             public void onLoadMore(int page, int totalItemsCount, RecyclerView view) {
                 TimelineAdapter adapter = (TimelineAdapter) view.getAdapter();
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index ea10731d..6dd7527d 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -9,6 +9,11 @@
             android:title="@string/pref_title_light_theme"
             android:defaultValue="false" />
 
+        <CheckBoxPreference
+            android:key="fabHide"
+            android:title="Hide FAB while scrolling"
+            android:defaultValue="false" />
+
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/pref_title_browser_settings">
         <CheckBoxPreference