diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java
index f76733160..322b4f75d 100644
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -8,7 +8,6 @@ package com.todoroo.astrid.activity;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.KeyEvent;
-import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.todoroo.andlib.utility.AndroidUtilities;
@@ -34,19 +33,13 @@ public class TaskEditActivity extends AstridActivity {
 		setContentView(R.layout.task_edit_wrapper_activity);
 
 		actionBar.setDisplayHomeAsUpEnabled(true);
-		actionBar.setDisplayShowTitleEnabled(false);
-
-		actionBar.setDisplayShowCustomEnabled(true);
-		actionBar.setCustomView(R.layout.header_title_view);
-		((TextView) actionBar.getCustomView().findViewById(R.id.title)).setText(R.string.TAd_contextEditTask);
-
+		actionBar.setDisplayShowTitleEnabled(true);
 	}
 
 	public void updateTitle(boolean isNewTask) {
 	    ActionBar actionBar = getSupportActionBar();
 	    if (actionBar != null) {
-	        TextView title = ((TextView) actionBar.getCustomView().findViewById(R.id.title));
-            title.setText(""); //$NON-NLS-1$
+            actionBar.setTitle(isNewTask ? R.string.TEA_new_task : R.string.TAd_contextEditTask);
         }
 	}
 
diff --git a/astrid/src/main/res/values-ca/strings.xml b/astrid/src/main/res/values-ca/strings.xml
index b903310bc..f7ccbc98e 100644
--- a/astrid/src/main/res/values-ca/strings.xml
+++ b/astrid/src/main/res/values-ca/strings.xml
@@ -156,6 +156,7 @@
 	<string name="hide_until_prompt">Mostra a la meva llista</string>
 	<string name="TEA_load_more">Carrega més...</string>
 	<string name="TEA_when_dialog_title">Quan venç?</string>
+	<string name="TEA_new_task">Tasca nova</string>
 	<string name="MCA_title">En/na %1$s\nha trucat a les %2$s</string>
 	<string name="MCA_return_call">Truca ara</string>
 	<string name="MCA_add_task">Truca després</string>
diff --git a/astrid/src/main/res/values-cs/strings.xml b/astrid/src/main/res/values-cs/strings.xml
index 2db9008f8..1727d29e5 100644
--- a/astrid/src/main/res/values-cs/strings.xml
+++ b/astrid/src/main/res/values-cs/strings.xml
@@ -147,6 +147,7 @@
 	<string name="hide_until_prompt">Zobrazit v mém seznamu</string>
 	<string name="TEA_load_more">Více...</string>
 	<string name="TEA_when_dialog_title">Kdy je termín?</string>
+	<string name="TEA_new_task">Nový úkol</string>
 	<string name="MCA_title">V %2$s volal\n%1$s</string>
 	<string name="MCA_return_call">Hned zavolat</string>
 	<string name="MCA_add_task">Zavolat později</string>
diff --git a/astrid/src/main/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml
index 9b82c10e1..7a789fe09 100644
--- a/astrid/src/main/res/values-de/strings.xml
+++ b/astrid/src/main/res/values-de/strings.xml
@@ -153,6 +153,7 @@
 	<string name="hide_until_prompt">Anzeigen in meiner Liste</string>
 	<string name="TEA_load_more">Weitere laden …</string>
 	<string name="TEA_when_dialog_title">Wann ist das fällig?</string>
+	<string name="TEA_new_task">Neue Aufgabe</string>
 	<string name="MCA_title">%1$s hat um %2$s angerufen</string>
 	<string name="MCA_return_call">Jetzt anrufen</string>
 	<string name="MCA_add_task">Später anrufen</string>
diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml
index 2c6b145af..7c3da9386 100644
--- a/astrid/src/main/res/values-es/strings.xml
+++ b/astrid/src/main/res/values-es/strings.xml
@@ -161,6 +161,7 @@
 	<string name="hide_until_prompt">Mostrar en mi lista</string>
 	<string name="TEA_load_more">Cargar mas...</string>
 	<string name="TEA_when_dialog_title">¿Para cuando esta previsto?</string>
+	<string name="TEA_new_task">Nueva Tarea</string>
 	<string name="MCA_title">%1$s\nllamó a las %2$s</string>
 	<string name="MCA_return_call">Llamar ahora</string>
 	<string name="MCA_add_task">Llamar luego</string>
diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml
index 031d1c19e..bd0cb8b7b 100644
--- a/astrid/src/main/res/values-fr/strings.xml
+++ b/astrid/src/main/res/values-fr/strings.xml
@@ -158,6 +158,7 @@
 	<string name="hide_until_prompt">Montrer dans ma liste</string>
 	<string name="TEA_load_more">Charger plus...</string>
 	<string name="TEA_when_dialog_title">Pour quand est-ce prévu ?</string>
+	<string name="TEA_new_task">Nouvelle tâche</string>
 	<string name="MCA_title">\"%1$s\na appelé à  %2$s\"</string>
 	<string name="MCA_return_call">Appeler maintenant</string>
 	<string name="MCA_add_task">Appeler plus tard</string>
diff --git a/astrid/src/main/res/values-it/strings.xml b/astrid/src/main/res/values-it/strings.xml
index 244a4d365..3a9330cd4 100644
--- a/astrid/src/main/res/values-it/strings.xml
+++ b/astrid/src/main/res/values-it/strings.xml
@@ -146,6 +146,7 @@
 	<string name="hide_until_prompt">Mostra nella mia lista</string>
 	<string name="TEA_load_more">Caricane di più...</string>
 	<string name="TEA_when_dialog_title">Quando dovrà terminare?</string>
+	<string name="TEA_new_task">Nuova Attività</string>
 	<string name="MCA_title">%1$s\nha chiamato alle %2$s</string>
 	<string name="MCA_return_call">Chiama ora</string>
 	<string name="MCA_add_task">Chiama più tardi</string>
diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml
index 361be617c..82c8acaf9 100644
--- a/astrid/src/main/res/values-iw/strings.xml
+++ b/astrid/src/main/res/values-iw/strings.xml
@@ -155,6 +155,7 @@
 	<string name="hide_until_prompt">הצג ברשימה שלי</string>
 	<string name="TEA_load_more">טען עוד...</string>
 	<string name="TEA_when_dialog_title">למתי?</string>
+	<string name="TEA_new_task">משימה חדשה</string>
 	<string name="MCA_title">%1$s \nהתקשר ב־%2$s</string>
 	<string name="MCA_return_call">התקשר כעת</string>
 	<string name="MCA_add_task">התקשר מאוחר יותר</string>
diff --git a/astrid/src/main/res/values-ja/strings.xml b/astrid/src/main/res/values-ja/strings.xml
index 733f27ed6..21bd4d6c3 100644
--- a/astrid/src/main/res/values-ja/strings.xml
+++ b/astrid/src/main/res/values-ja/strings.xml
@@ -125,6 +125,7 @@
 	<string name="TEA_control_lists">リスト</string>
 	<string name="TEA_control_notes">概要</string>
 	<string name="TEA_control_reminders">リマインダー</string>
+	<string name="TEA_new_task">新しいタスク</string>
 	<string name="MCA_title">%1$s\ncalled at %2$s</string>
 	<string name="MCA_ignore">無視する</string>
 	<string name="CRA_ignore">無視する</string>
diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml
index 33e2b026c..cb9b6cbf4 100644
--- a/astrid/src/main/res/values-ko/strings.xml
+++ b/astrid/src/main/res/values-ko/strings.xml
@@ -164,6 +164,7 @@
 	<string name="hide_until_prompt">내 목록에 표시</string>
 	<string name="TEA_load_more">더 불러오기...</string>
 	<string name="TEA_when_dialog_title">마감일이 언제입니까?</string>
+	<string name="TEA_new_task">새 일정</string>
 	<string name="MCA_title">%1$s\n받은 시간: %2$s</string>
 	<string name="MCA_return_call">지금 전화하기</string>
 	<string name="MCA_add_task">나중에 전화하기</string>
diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml
index c6a63ea4e..a1a434dd7 100644
--- a/astrid/src/main/res/values-nl/strings.xml
+++ b/astrid/src/main/res/values-nl/strings.xml
@@ -159,6 +159,7 @@
 	<string name="hide_until_prompt">Laat zien in mijn lijst</string>
 	<string name="TEA_load_more">Laad meer...</string>
 	<string name="TEA_when_dialog_title">Wanneer moet dit gedaan zijn?</string>
+	<string name="TEA_new_task">Nieuwe Taak</string>
 	<string name="MCA_title">%1$s\nheeft gebeld op (%2$s)</string>
 	<string name="MCA_return_call">Bel nu</string>
 	<string name="MCA_add_task">Bel later</string>
diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml
index 9dc9e3989..89f0f038c 100644
--- a/astrid/src/main/res/values-pl/strings.xml
+++ b/astrid/src/main/res/values-pl/strings.xml
@@ -153,6 +153,7 @@
 	<string name="hide_until_prompt">Pokaż na mojej liście</string>
 	<string name="TEA_load_more">Wczytaj więcej...</string>
 	<string name="TEA_when_dialog_title">Na kiedy ma być zrobione?</string>
+	<string name="TEA_new_task">Nowe zadanie</string>
 	<string name="MCA_title">%1$s\ndzwonił\\-a o %2$s</string>
 	<string name="MCA_return_call">Zadzwoń teraz</string>
 	<string name="MCA_add_task">Zadzwoń później</string>
diff --git a/astrid/src/main/res/values-pt-rBR/strings.xml b/astrid/src/main/res/values-pt-rBR/strings.xml
index 77e778a3a..a375e8c0b 100644
--- a/astrid/src/main/res/values-pt-rBR/strings.xml
+++ b/astrid/src/main/res/values-pt-rBR/strings.xml
@@ -157,6 +157,7 @@
 	<string name="hide_until_prompt">Mostrar na minha lista</string>
 	<string name="TEA_load_more">Carregar mais...</string>
 	<string name="TEA_when_dialog_title">Quando vence?</string>
+	<string name="TEA_new_task">Nova Tarefa</string>
 	<string name="MCA_title">%1$s\nligou às %2$s</string>
 	<string name="MCA_return_call">Ligar agora</string>
 	<string name="MCA_add_task">Ligar mais tarde</string>
diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml
index 64bce2b67..2b472648d 100644
--- a/astrid/src/main/res/values-ru/strings.xml
+++ b/astrid/src/main/res/values-ru/strings.xml
@@ -156,6 +156,7 @@
 	<string name="hide_until_prompt">Показать в моем листе</string>
 	<string name="TEA_load_more">Загрузить больше...</string>
 	<string name="TEA_when_dialog_title">Когда это должно произойти?</string>
+	<string name="TEA_new_task">Новое задание</string>
 	<string name="MCA_title">%1$s\nзвонил(а) в %2$s</string>
 	<string name="MCA_return_call">Позвонить сейчас</string>
 	<string name="MCA_add_task">Позвонить позже</string>
diff --git a/astrid/src/main/res/values-sv/strings.xml b/astrid/src/main/res/values-sv/strings.xml
index 0a88121e8..ab52e2d64 100644
--- a/astrid/src/main/res/values-sv/strings.xml
+++ b/astrid/src/main/res/values-sv/strings.xml
@@ -149,6 +149,7 @@
 	<string name="hide_until_prompt">Visa i min lista</string>
 	<string name="TEA_load_more">Ladda mer...</string>
 	<string name="TEA_when_dialog_title">När ska uppgiften vara slutförd?</string>
+	<string name="TEA_new_task">Ny uppgift</string>
 	<string name="MCA_title">%1$s\nringde kl %2$s</string>
 	<string name="MCA_return_call">Ring nu</string>
 	<string name="MCA_add_task">Ring senare</string>
diff --git a/astrid/src/main/res/values-tr/strings.xml b/astrid/src/main/res/values-tr/strings.xml
index 38cb28628..57fd7bfba 100644
--- a/astrid/src/main/res/values-tr/strings.xml
+++ b/astrid/src/main/res/values-tr/strings.xml
@@ -144,6 +144,7 @@
 	<string name="hide_until_prompt">Listemde göster</string>
 	<string name="TEA_load_more">Daha yükle...</string>
 	<string name="TEA_when_dialog_title">Son zamanı nedir?</string>
+	<string name="TEA_new_task">Yeni Görev</string>
 	<string name="MCA_title">%1$s aradı\nzamanı: %2$s</string>
 	<string name="MCA_return_call">Şimdi ara</string>
 	<string name="MCA_add_task">Sonra ara</string>
diff --git a/astrid/src/main/res/values-uk/strings.xml b/astrid/src/main/res/values-uk/strings.xml
index 798d3415f..22c64a3df 100644
--- a/astrid/src/main/res/values-uk/strings.xml
+++ b/astrid/src/main/res/values-uk/strings.xml
@@ -164,6 +164,7 @@
 	<string name="hide_until_prompt">Показувати в мому списку</string>
 	<string name="TEA_load_more">Завантажити більше...</string>
 	<string name="TEA_when_dialog_title">Коли це потрібно виконати?</string>
+	<string name="TEA_new_task">Нове завдання</string>
 	<string name="MCA_title">%1$s\nтелефонував о %2$s</string>
 	<string name="MCA_return_call">Зателефонувати зараз</string>
 	<string name="MCA_add_task">Зателефонувати пізніше</string>
diff --git a/astrid/src/main/res/values-zh-rCN/strings.xml b/astrid/src/main/res/values-zh-rCN/strings.xml
index 7eac784aa..893027199 100644
--- a/astrid/src/main/res/values-zh-rCN/strings.xml
+++ b/astrid/src/main/res/values-zh-rCN/strings.xml
@@ -147,6 +147,7 @@
 	<string name="hide_until_prompt">在我的列表中显示</string>
 	<string name="TEA_load_more">加载更多……</string>
 	<string name="TEA_when_dialog_title">这项活动定在什么时候呀？</string>
+	<string name="TEA_new_task">新建任务</string>
 	<string name="MCA_title">%1$s\n在 %2$s 给您打过电话</string>
 	<string name="MCA_return_call">现在回电</string>
 	<string name="MCA_add_task">稍后回电</string>
diff --git a/astrid/src/main/res/values-zh-rTW/strings.xml b/astrid/src/main/res/values-zh-rTW/strings.xml
index 20c71437a..f810589a4 100644
--- a/astrid/src/main/res/values-zh-rTW/strings.xml
+++ b/astrid/src/main/res/values-zh-rTW/strings.xml
@@ -147,6 +147,7 @@
 	<string name="hide_until_prompt">在我的列表中顯示</string>
 	<string name="TEA_load_more">加載更多……</string>
 	<string name="TEA_when_dialog_title">這項活動定在什麼時候呀？</string>
+	<string name="TEA_new_task">新建任務工作</string>
 	<string name="MCA_title">%1$s\n在 %2$s 給您打過電話</string>
 	<string name="MCA_return_call">現在回電</string>
 	<string name="MCA_add_task">稍後回電</string>
diff --git a/astrid/src/main/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml
index 274074f3a..8449b6883 100644
--- a/astrid/src/main/res/values/strings-core.xml
+++ b/astrid/src/main/res/values/strings-core.xml
@@ -327,6 +327,8 @@
   <!-- When controls dialog -->
   <string name="TEA_when_dialog_title">When is this due?</string>
 
+  <string name="TEA_new_task">New Task</string>
+
   <!-- ===================================================== MissedCallActivity == -->
   
   <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->