diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2abdf2a68..bc666cb08 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -64,7 +64,6 @@
 	<string name="repo_delete_title">Choose repository to remove</string>
 
 	<string name="repo_update_title">Update repositories</string>
-	<string name="tab_installed">Installed</string>
 	<string name="tab_noninstalled">Available</string>
 	<string name="tab_updates">Updates</string>
 	<string name="one_update_available">1 update is available.</string>
diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index 4e2361257..f5a056e7e 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -257,6 +257,10 @@ public class AppDetails extends ListActivity {
             appid = i.getStringExtra("appid");
         }
 
+        if (i.hasExtra("from")) {
+            setTitle(i.getStringExtra("from"));
+        }
+
         mPm = getPackageManager();
         // Get the preferences we're going to use in this Activity...
         AppDetails old = (AppDetails) getLastNonConfigurationInstance();
diff --git a/src/org/fdroid/fdroid/AppListManager.java b/src/org/fdroid/fdroid/AppListManager.java
index 1e758483f..8e30ee7c1 100644
--- a/src/org/fdroid/fdroid/AppListManager.java
+++ b/src/org/fdroid/fdroid/AppListManager.java
@@ -228,6 +228,10 @@ public class AppListManager {
         }
     }
 
+    public String getCurrentCategory() {
+        return this.currentCategory;
+    }
+
     static class WhatsNewComparator implements Comparator<DB.App> {
         @Override
         public int compare(DB.App lhs, DB.App rhs) {
diff --git a/src/org/fdroid/fdroid/compat/TabManager.java b/src/org/fdroid/fdroid/compat/TabManager.java
index b7f3e9d5c..16fe8b8d5 100644
--- a/src/org/fdroid/fdroid/compat/TabManager.java
+++ b/src/org/fdroid/fdroid/compat/TabManager.java
@@ -98,7 +98,7 @@ class OldTabManagerImpl extends TabManager {
 
         TabHost.TabSpec installedTabSpec = tabHost.newTabSpec("installed")
                 .setIndicator(
-                        parent.getString(R.string.tab_installed),
+                        parent.getString(R.string.inst),
                         parent.getResources().getDrawable(android.R.drawable.star_off))
                 .setContent(factory);
 
diff --git a/src/org/fdroid/fdroid/views/AppListFragmentPageAdapter.java b/src/org/fdroid/fdroid/views/AppListFragmentPageAdapter.java
index cd8946490..2df2e7133 100644
--- a/src/org/fdroid/fdroid/views/AppListFragmentPageAdapter.java
+++ b/src/org/fdroid/fdroid/views/AppListFragmentPageAdapter.java
@@ -44,7 +44,7 @@ public class AppListFragmentPageAdapter extends FragmentPagerAdapter {
             case 0:
                 return parent.getString(R.string.tab_noninstalled);
             case 1:
-                return parent.getString(R.string.tab_installed);
+                return parent.getString(R.string.inst);
             case 2:
                 return parent.getString(R.string.tab_updates) + " ("
                     + parent.getManager().getCanUpdateAdapter().getCount() + ")";
diff --git a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java b/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
index 5177c4ac9..98ee1d9b4 100644
--- a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
@@ -16,10 +16,12 @@ import org.fdroid.fdroid.views.AppListView;
 
 abstract class AppListFragment extends Fragment implements AdapterView.OnItemClickListener, Preferences.ChangeListener {
 
-    private FDroid parent;
+    protected FDroid parent;
 
     protected abstract AppListAdapter getAppListAdapter();
 
+    protected abstract String getFromTitle();
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -76,6 +78,7 @@ abstract class AppListFragment extends Fragment implements AdapterView.OnItemCli
         final DB.App app = (DB.App)getAppListAdapter().getItem(position);
         Intent intent = new Intent(getActivity(), AppDetails.class);
         intent.putExtra("appid", app.id);
+        intent.putExtra("from", getFromTitle());
         startActivityForResult(intent, FDroid.REQUEST_APPDETAILS);
     }
 
diff --git a/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
index 26f34e363..e8a50410a 100644
--- a/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
@@ -57,4 +57,9 @@ public class AvailableAppsFragment extends AppListFragment implements AdapterVie
     protected AppListAdapter getAppListAdapter() {
         return getAppListManager().getAvailableAdapter();
     }
+
+    @Override
+    protected String getFromTitle() {
+        return getAppListManager().getCurrentCategory();
+    }
 }
diff --git a/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java b/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java
index a390f365c..1b3ebe9a3 100644
--- a/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java
@@ -5,6 +5,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.views.AppListAdapter;
 
 public class CanUpdateAppsFragment extends AppListFragment {
@@ -18,4 +19,9 @@ public class CanUpdateAppsFragment extends AppListFragment {
     protected AppListAdapter getAppListAdapter() {
         return getAppListManager().getCanUpdateAdapter();
     }
+
+    @Override
+    protected String getFromTitle() {
+        return parent.getString(R.string.tab_updates);
+    }
 }
diff --git a/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java b/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
index db3a93cfc..b27bec6b1 100644
--- a/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
@@ -5,6 +5,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.views.AppListAdapter;
 
 public class InstalledAppsFragment extends AppListFragment {
@@ -18,4 +19,9 @@ public class InstalledAppsFragment extends AppListFragment {
     protected AppListAdapter getAppListAdapter() {
         return getAppListManager().getInstalledAdapter();
     }
+
+    @Override
+    protected String getFromTitle() {
+        return parent.getString(R.string.inst);
+    }
 }