diff --git a/astrid/res/layout/header_edit_views.xml b/astrid/res/layout/header_edit_views.xml
new file mode 100644
index 000000000..7da455f32
--- /dev/null
+++ b/astrid/res/layout/header_edit_views.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/list_title"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:paddingLeft="10dip"
+    android:gravity="center_vertical"
+    android:text="@string/TAd_contextEditTask"
+    style="@style/TextAppearance.ActionBar_ListsHeader"/>
\ No newline at end of file
diff --git a/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java
index 23a37a88d..ec945c208 100644
--- a/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java
@@ -162,6 +162,10 @@ public class AstridWrapperActivity extends FragmentActivity
         transaction.commit();
     }
 
+    public boolean isMultipleFragments() {
+        return mMultipleFragments;
+    }
+
     @Override
     public void onTaskListItemClicked(int category, int position) {
 
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index 89cf153c0..de8a246d7 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -264,7 +264,8 @@ public class FilterListActivity extends ExpandableListFragment {
         item = menu.add(Menu.NONE, MENU_SEARCH_ID, Menu.NONE,
                 R.string.FLA_menu_search);
         item.setIcon(android.R.drawable.ic_menu_search);
-        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        if (((AstridWrapperActivity) getActivity()).isMultipleFragments())
+            item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
 //        item = menu.add(Menu.NONE, MENU_REFRESH_ID, Menu.NONE,
 //                R.string.TLA_menu_sync);
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index b0199462c..2245c61f4 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -677,7 +677,10 @@ public final class TaskEditActivity extends Fragment {
 
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
-            save(false);
+            if (title.getText().length() == 0)
+                discardButtonClick();
+            else
+                saveButtonClick();
             return true;
         }
         return false;
@@ -826,7 +829,10 @@ public final class TaskEditActivity extends Fragment {
             commentsButtonClick();
             return true;
         case android.R.id.home:
-            saveButtonClick();
+            if (title.getText().length() == 0)
+                discardButtonClick();
+            else
+                saveButtonClick();
             return true;
         }
 
@@ -838,21 +844,23 @@ public final class TaskEditActivity extends Fragment {
         super.onCreateOptionsMenu(menu, inflater);
         MenuItem item;
 
-        item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save);
-        item.setIcon(android.R.drawable.ic_menu_save);
-        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
         item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard);
         item.setIcon(android.R.drawable.ic_menu_close_clear_cancel);
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
+        item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save);
+        item.setIcon(android.R.drawable.ic_menu_save);
+        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+
         item = menu.add(Menu.NONE, MENU_DELETE_ID, 0, R.string.TEA_menu_delete);
         item.setIcon(android.R.drawable.ic_menu_delete);
-        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        if (((AstridWrapperActivity) getActivity()).isMultipleFragments())
+            item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(Menu.NONE, MENU_COMMENTS_ID, 0, R.string.TEA_menu_comments);
         item.setIcon(R.drawable.icn_cmmt_off);
-        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        if (((AstridWrapperActivity) getActivity()).isMultipleFragments())
+            item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
     }
 
     @Override
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java
index d2a0fcf5f..efdffc131 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java
@@ -1,6 +1,7 @@
 package com.todoroo.astrid.activity;
 
 import android.os.Bundle;
+import android.support.v4.app.ActionBar;
 import android.support.v4.app.Fragment;
 import android.view.KeyEvent;
 
@@ -18,7 +19,12 @@ public class TaskEditWrapperActivity extends AstridWrapperActivity {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.task_edit_wrapper_activity);
 
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+		ActionBar actionBar = getSupportActionBar();
+		actionBar.setDisplayShowHomeEnabled(false);
+		actionBar.setDisplayShowTitleEnabled(false);
+
+		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+		actionBar.setCustomView(R.layout.header_edit_views);
 	}
 
     /* (non-Javadoc)
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 5a1bac72e..24d62c87f 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -380,7 +380,8 @@ public class TaskListActivity extends ListFragment implements OnScrollListener,
         MenuItem item = menu.add(Menu.NONE, MENU_SYNC_ID, Menu.NONE,
                 R.string.TLA_menu_sync);
         item.setIcon(R.drawable.ic_menu_refresh);
-        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        if (((AstridWrapperActivity) getActivity()).isMultipleFragments())
+            item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
     }
 
     /**
@@ -398,7 +399,8 @@ public class TaskListActivity extends ListFragment implements OnScrollListener,
         if (!(this instanceof DraggableTaskListActivity)) {
             item = menu.add(Menu.NONE, MENU_SORT_ID, Menu.NONE, R.string.TLA_menu_sort);
             item.setIcon(android.R.drawable.ic_menu_sort_by_size);
-            item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            if (((AstridWrapperActivity) getActivity()).isMultipleFragments())
+                item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         }
 
         addSyncRefreshMenuItem(menu);