diff --git a/astrid/res/layout-small/task_edit_activity.xml b/astrid/res/layout-small/task_edit_activity.xml
deleted file mode 100644
index de0207476..000000000
--- a/astrid/res/layout-small/task_edit_activity.xml
+++ /dev/null
@@ -1,523 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-  android:id="@+id/taskEditParent"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
-  style="@style/Content">
-  
-  <View
-    android:layout_width="fill_parent"
-    android:layout_height="2dip"
-    android:background="@color/task_edit_selected" />
-    
-  
-  <!-- ======================================================= tab: basic == -->
-  <ScrollView
-    android:id="@+id/tab_basic"
-    android:layout_above="@id/edit_footer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-      android:padding="4dip"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-      <!-- title -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_title_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <com.todoroo.astrid.ui.ErrorCatchingEditText
-        android:id="@+id/title"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/TEA_title_hint"
-        android:autoText="true"
-        android:text=""
-        android:capitalize="sentences" 
-        android:freezesText="true"/>
-      <!-- importance -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_importance_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <LinearLayout
-        android:id="@+id/importance_container"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-      </LinearLayout>
-      <!-- urgency -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_urgency_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <Button
-          android:id="@+id/urgency_date"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:drawableLeft="@drawable/gl_date" />
-        <Button
-          android:id="@+id/urgency_time"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:drawableLeft="@drawable/gl_time" />
-      </LinearLayout>
-      <!-- add-ons -->
-      <LinearLayout
-        android:id="@+id/addons_urgency"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
-      <!-- tags -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_tags_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <LinearLayout
-        android:id="@+id/tags_container"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <Spinner
-        android:id="@+id/tags_dropdown"
-        android:paddingBottom="5dip"
-        android:entries="@array/TEA_loading"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <!-- notes -->
-      <TextView
-        android:id="@+id/notes_label"
-        android:paddingTop="5dip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_note_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <!-- Voice Add Note Button -->
-        <ImageButton
-          android:id="@+id/voiceAddNoteButton"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:src="@drawable/tango_microphone"
-          android:scaleType="fitCenter"
-          android:visibility="gone" />
-        <EditText
-          android:id="@+id/notes"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_weight="100"
-          android:scrollbars="vertical"
-          android:gravity="top"
-          android:hint="@string/TEA_notes_hint"
-          android:autoText="true"
-          android:capitalize="sentences"
-          android:singleLine="false"
-          android:freezesText="true" />
-      </LinearLayout>
-        <!-- buttons -->
-	  <LinearLayout android:id="@+id/edit_footer"
-	    android:orientation="horizontal"
-	    android:layout_width="fill_parent"
-	    android:layout_height="48dip"
-	    android:layout_marginTop="7dip"
-	    android:layout_alignParentBottom="true"
-	    android:padding="5dip"
-	    android:background="@drawable/footer_background"
-	    android:baselineAligned="false">
-	    <Button
-	      android:id="@+id/save"
-	      android:layout_width="fill_parent"
-	      android:layout_height="fill_parent"
-	      android:layout_marginRight="5dip"
-	      android:background="@drawable/footer_greenbtn"
-	      android:text="@string/DLG_save"
-	      android:textStyle="bold"
-	      style="@style/TextAppearance.TEA_action"
-	      android:layout_weight="1" />
-	    <Button
-	      android:id="@+id/discard"
-	      android:layout_width="fill_parent"
-	      android:layout_height="fill_parent"
-	      android:layout_marginLeft="5dip"
-	      android:background="@drawable/footer_redbtn"
-	      android:text="@android:string/cancel"
-	      style="@style/TextAppearance.TEA_action"
-	      android:layout_weight="1" />
-	  </LinearLayout>
-    </LinearLayout>
-  </ScrollView>
-  
-  <!-- ===================================================== tab: sharing == -->
-  <ScrollView
-    android:id="@+id/tab_share"
-    android:layout_above="@id/edit_footer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-      android:padding="4dip"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-      <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="5dip"
-        style="@style/TextAppearance.GEN_EditLabel"
-        android:text="@string/actfm_EPA_assign_label" />
-      <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <Spinner
-          android:id="@+id/assigned_spinner"
-          android:layout_width="fill_parent"
-          android:layout_height="45dip"
-          android:layout_weight="1"
-          android:layout_gravity="center_vertical"
-          android:hint="@string/actfm_person_hint" />
-        <com.todoroo.astrid.ui.ContactsAutoComplete
-          android:id="@+id/assigned_custom"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:layout_gravity="center_vertical"
-          android:visibility="gone"
-          android:hint="@string/actfm_person_hint" />
-        <ImageButton
-          android:id="@+id/assigned_clear"
-          style="?android:attr/buttonStyleInset"
-          android:src="@android:drawable/ic_delete"
-          android:layout_width="wrap_content"
-          android:layout_height="fill_parent"
-          android:layout_marginTop="2dip"
-          android:layout_marginRight="2dip"
-          android:layout_marginBottom="2dip"
-          android:visibility="gone"
-          android:gravity="center_vertical" />
-      </LinearLayout>
-      <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="5dip"
-        android:paddingBottom="5dip"
-        style="@style/TextAppearance.GEN_EditLabel"
-        android:text="@string/actfm_EPA_share_with" />
-      <com.todoroo.astrid.ui.PeopleContainer
-        android:id="@+id/share_container"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <LinearLayout
-        android:id="@+id/share_additional"
-        android:orientation="vertical"
-        android:padding="5dip"
-        android:visibility="gone"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <View
-          android:layout_width="fill_parent"
-          android:layout_height="1dip"
-          android:background="@android:drawable/divider_horizontal_dark" />
-        <TextView
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:paddingTop="5dip"
-          android:paddingBottom="5dip"
-          android:text="@string/actfm_EPA_message_text" />
-        <EditText
-          android:id="@+id/message"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:scrollbars="vertical"
-          android:text="@string/actfm_EPA_message_body"
-          android:autoText="true"
-          android:capitalize="sentences"
-          android:singleLine="false" />
-        <TextView
-          android:id="@+id/tag_label"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:paddingBottom="5dip"
-          android:visibility="gone"
-          android:text="@string/actfm_EPA_tag_label" />
-        <EditText
-          android:id="@+id/tag_name"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:visibility="gone"
-          android:hint="@string/actfm_EPA_tag_hint" />
-        <View
-          android:layout_width="fill_parent"
-          android:layout_height="1dip"
-          android:background="@android:drawable/divider_horizontal_dark" />
-      </LinearLayout>
-      <LinearLayout
-        android:id="@+id/collaborators"
-        android:orientation="vertical"
-        android:padding="5dip"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <CheckBox
-        style="@style/TextAppearance.GEN_EditLabel" 
-        android:id="@+id/checkbox_facebook"
-        android:text="@string/actfm_EPA_facebook"
-        android:paddingLeft="45dip"
-        android:visibility="gone"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <CheckBox
-        style="@style/TextAppearance.GEN_EditLabel" 
-        android:id="@+id/checkbox_twitter"
-        android:text="@string/actfm_EPA_twitter"
-        android:paddingLeft="45dip"
-        android:visibility="gone"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <View
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:layout_margin="15dip"
-        android:background="@android:drawable/divider_horizontal_dark" />
-      <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="15dip"
-        android:text="@string/actfm_EPA_intro"
-        android:gravity="center"
-        android:textColor="#ee9900" />
-	    <LinearLayout android:id="@+id/edit_footer2"
-	        android:orientation="horizontal"
-	        android:layout_width="fill_parent"
-	        android:layout_height="48dip"
-	        android:layout_marginTop="7dip"
-	        android:layout_alignParentBottom="true"
-	        android:padding="5dip"
-	        android:background="@drawable/footer_background"
-	        android:baselineAligned="false">
-	        <Button
-	          android:id="@+id/save2"
-	          android:layout_width="fill_parent"
-	          android:layout_height="fill_parent"
-	          android:layout_marginRight="5dip"
-	          android:background="@drawable/footer_greenbtn"
-	          android:text="@string/DLG_save"
-	          android:textStyle="bold"
-	          style="@style/TextAppearance.TEA_action"
-	          android:layout_weight="1" />
-	        <Button
-	          android:id="@+id/discard2"
-	          android:layout_width="fill_parent"
-	          android:layout_height="fill_parent"
-	          android:layout_marginLeft="5dip"
-	          android:background="@drawable/footer_redbtn"
-	          android:text="@android:string/cancel"
-	          style="@style/TextAppearance.TEA_action"
-	          android:layout_weight="1" />
-	      </LinearLayout>
-    </LinearLayout>
-  </ScrollView>
-
-  <!-- ====================================================== tab: alarms == -->
-  <ScrollView
-    android:id="@+id/tab_alarms"
-    android:layout_above="@id/edit_footer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-      android:padding="4dip"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-      <!-- reminders -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_reminder_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <CheckBox
-        style="@style/TextAppearance.GEN_EditLabel" 
-        android:id="@+id/reminder_due"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:button="@drawable/btn_check_small"       
-        android:text="@string/TEA_reminder_due" />
-      <CheckBox
-        style="@style/TextAppearance.GEN_EditLabel" 
-        android:id="@+id/reminder_overdue"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:button="@drawable/btn_check_small"       
-        android:text="@string/TEA_reminder_overdue" />
-      <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
-        <CheckBox
-          style="@style/TextAppearance.GEN_EditLabel"   
-          android:id="@+id/reminder_random"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginLeft="5dip"
-          android:button="@drawable/btn_check_small"       
-          android:text="@string/TEA_reminder_random" />
-        <Spinner
-          android:id="@+id/reminder_random_interval"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content" />
-      </LinearLayout>
-      <!-- reminder mode -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_reminder_alarm_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <Spinner
-        android:id="@+id/reminder_alarm"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <!-- add-ons -->
-      <LinearLayout
-        android:id="@+id/addons_alarms"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
-	    <LinearLayout android:id="@+id/edit_footer3"
-	        android:orientation="horizontal"
-	        android:layout_width="fill_parent"
-	        android:layout_height="48dip"
-	        android:layout_marginTop="7dip"
-	        android:layout_alignParentBottom="true"
-	        android:padding="5dip"
-	        android:background="@drawable/footer_background"
-	        android:baselineAligned="false">
-	        <Button
-	          android:id="@+id/save3"
-	          android:layout_width="fill_parent"
-	          android:layout_height="fill_parent"
-	          android:layout_marginRight="5dip"
-	          android:background="@drawable/footer_greenbtn"
-	          android:text="@string/DLG_save"
-	          android:textStyle="bold"
-	          style="@style/TextAppearance.TEA_action"
-	          android:layout_weight="1" />
-	        <Button
-	          android:id="@+id/discard3"
-	          android:layout_width="fill_parent"
-	          android:layout_height="fill_parent"
-	          android:layout_marginLeft="5dip"
-	          android:background="@drawable/footer_redbtn"
-	          android:text="@android:string/cancel"
-	          style="@style/TextAppearance.TEA_action"
-	          android:layout_weight="1" />
-	      </LinearLayout>
-    </LinearLayout>
-  </ScrollView>
-  
-  <!-- ======================================================= tab: more == -->
-  <ScrollView
-    android:id="@+id/tab_more"
-    android:layout_above="@id/edit_footer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-      android:padding="4dip"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-      <!-- hide until -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_hideUntil_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <Spinner
-        android:id="@+id/hideUntil"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <!-- add-ons -->
-      <LinearLayout
-        android:id="@+id/addons_more"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-        <LinearLayout
-          android:id="@+id/addons_empty"
-          android:layout_width="fill_parent"
-          android:layout_height="fill_parent"
-          android:layout_weight="100"
-          android:gravity="center"
-          android:visibility="gone"
-          android:orientation="vertical">
-          <ImageView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:padding="20dip"
-            android:src="@drawable/icon_pp" />
-          <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/TEA_addons_text"
-            android:padding="10dip"
-            android:gravity="center"
-            style="@style/TextAppearance.TLA_NoItems" />
-          <Button
-            android:id="@+id/addons_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="10dip"
-            android:text="@string/TEA_addons_button" />
-        </LinearLayout>
-      </LinearLayout>
-	    <LinearLayout android:id="@+id/edit_footer4"
-	        android:orientation="horizontal"
-	        android:layout_width="fill_parent"
-	        android:layout_height="48dip"
-	        android:layout_marginTop="7dip"
-	        android:layout_alignParentBottom="true"
-	        android:padding="5dip"
-	        android:background="@drawable/footer_background"
-	        android:baselineAligned="false">
-	        <Button
-	          android:id="@+id/save4"
-	          android:layout_width="fill_parent"
-	          android:layout_height="fill_parent"
-	          android:layout_marginRight="5dip"
-	          android:background="@drawable/footer_greenbtn"
-	          android:text="@string/DLG_save"
-	          android:textStyle="bold"
-	          style="@style/TextAppearance.TEA_action"
-	          android:layout_weight="1" />
-	        <Button
-	          android:id="@+id/discard4"
-	          android:layout_width="fill_parent"
-	          android:layout_height="fill_parent"
-	          android:layout_marginLeft="5dip"
-	          android:background="@drawable/footer_redbtn"
-	          android:text="@android:string/cancel"
-	          style="@style/TextAppearance.TEA_action"
-	          android:layout_weight="1" />
-	      </LinearLayout>
-    </LinearLayout>
-  </ScrollView>
-
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index 13a031944..a6718906c 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -7,430 +7,199 @@
   android:layout_height="fill_parent"
   style="@style/Content">
   
-  <View
-    android:layout_width="fill_parent"
-    android:layout_height="2dip"
-    android:background="@color/task_edit_selected" />
-    
-        
-  <!-- buttons -->
-  <LinearLayout android:id="@+id/edit_footer"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="48dip"
-    android:layout_alignParentBottom="true"
-    android:padding="5dip"
-    android:background="@drawable/footer_background"
-    android:baselineAligned="false">
-    <Button
-      android:id="@+id/save"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent"
-      android:layout_marginRight="5dip"
-      android:background="@drawable/footer_greenbtn"
-      android:text="@string/DLG_save"
-      android:textStyle="bold"
-      style="@style/TextAppearance.TEA_action"
-      android:layout_weight="1" />
-    <Button
-      android:id="@+id/discard"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent"
-      android:layout_marginLeft="5dip"
-      android:background="@drawable/footer_redbtn"
-      android:text="@android:string/cancel"
-      style="@style/TextAppearance.TEA_action"
-      android:layout_weight="1" />
-  </LinearLayout>
-  
-  <!-- ======================================================= tab: basic == -->
-  <ScrollView
-    android:id="@+id/tab_basic"
-    android:layout_above="@id/edit_footer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-      android:padding="7dip"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-      <!-- title -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_title_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <com.todoroo.astrid.ui.ErrorCatchingEditText
-        android:id="@+id/title"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/TEA_title_hint"
-        android:autoText="true"
-        android:text=""
-        android:capitalize="sentences" 
-        android:freezesText="true"/>
-      <!-- importance -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_importance_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <LinearLayout
-        android:id="@+id/importance_container"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-      </LinearLayout>
-      <!-- urgency -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_urgency_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <Button
-          android:id="@+id/urgency_date"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:drawableLeft="@drawable/gl_date" />
-        <Button
-          android:id="@+id/urgency_time"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:drawableLeft="@drawable/gl_time" />
-      </LinearLayout>
-      <!-- add-ons -->
-      <LinearLayout
-        android:id="@+id/addons_urgency"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
-      <!-- tags -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_tags_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <LinearLayout
-        android:id="@+id/tags_container"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <Spinner
-        android:id="@+id/tags_dropdown"
-        android:paddingBottom="5dip"
-        android:entries="@array/TEA_loading"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <!-- notes -->
-      <TextView
-        android:id="@+id/notes_label"
-        android:paddingTop="5dip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_note_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <!-- Voice Add Note Button -->
-        <ImageButton
-          android:id="@+id/voiceAddNoteButton"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:src="@drawable/tango_microphone"
-          android:scaleType="fitCenter"
-          android:visibility="gone" />
-        <EditText
-          android:id="@+id/notes"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_weight="100"
-          android:scrollbars="vertical"
-          android:gravity="top"
-          android:hint="@string/TEA_notes_hint"
-          android:autoText="true"
-          android:capitalize="sentences"
-          android:singleLine="false"
-          android:freezesText="true" />
-      </LinearLayout>
-    </LinearLayout>
-  </ScrollView>
-  
-  <!-- ===================================================== tab: sharing == -->
-  <ScrollView
-    android:id="@+id/tab_share"
-    android:layout_above="@id/edit_footer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-      android:padding="4dip"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-      <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="5dip"
-        style="@style/TextAppearance.GEN_EditLabel"
-        android:text="@string/actfm_EPA_assign_label" />
-      <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <Spinner
-          android:id="@+id/assigned_spinner"
-          android:layout_width="fill_parent"
-          android:layout_height="45dip"
-          android:layout_weight="1"
-          android:layout_gravity="center_vertical"
-          android:hint="@string/actfm_person_hint" />
-        <com.todoroo.astrid.ui.ContactsAutoComplete
-          android:id="@+id/assigned_custom"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:layout_gravity="center_vertical"
-          android:visibility="gone"
-          android:hint="@string/actfm_person_hint" />
-        <ImageButton
-          android:id="@+id/assigned_clear"
-          style="?android:attr/buttonStyleInset"
-          android:src="@android:drawable/ic_delete"
-          android:layout_width="wrap_content"
-          android:layout_height="fill_parent"
-          android:layout_marginTop="2dip"
-          android:layout_marginRight="2dip"
-          android:layout_marginBottom="2dip"
-          android:visibility="gone"
-          android:gravity="center_vertical" />
-      </LinearLayout>
-      <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="5dip"
-        android:paddingBottom="5dip"
-        style="@style/TextAppearance.GEN_EditLabel"
-        android:text="@string/actfm_EPA_share_with" />
-      <com.todoroo.astrid.ui.PeopleContainer
-        android:id="@+id/share_container"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <LinearLayout
-        android:id="@+id/share_additional"
-        android:orientation="vertical"
-        android:padding="5dip"
-        android:visibility="gone"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <View
-          android:layout_width="fill_parent"
-          android:layout_height="1dip"
-          android:background="@android:drawable/divider_horizontal_dark" />
-        <TextView
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:paddingTop="5dip"
-          android:paddingBottom="5dip"
-          android:text="@string/actfm_EPA_message_text" />
-        <EditText
-          android:id="@+id/message"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:scrollbars="vertical"
-          android:text="@string/actfm_EPA_message_body"
-          android:autoText="true"
-          android:capitalize="sentences"
-          android:singleLine="false" />
-        <TextView
-          android:id="@+id/tag_label"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:paddingBottom="5dip"
-          android:visibility="gone"
-          android:text="@string/actfm_EPA_tag_label" />
-        <EditText
-          android:id="@+id/tag_name"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:visibility="gone"
-          android:hint="@string/actfm_EPA_tag_hint" />
-        <View
-          android:layout_width="fill_parent"
-          android:layout_height="1dip"
-          android:background="@android:drawable/divider_horizontal_dark" />
-      </LinearLayout>
-      <LinearLayout
-        android:id="@+id/collaborators"
-        android:orientation="vertical"
-        android:padding="5dip"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <CheckBox
-        style="@style/TextAppearance.GEN_EditLabel" 
-        android:id="@+id/checkbox_facebook"
-        android:text="@string/actfm_EPA_facebook"
-        android:paddingLeft="45dip"
-        android:visibility="gone"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <CheckBox
-        style="@style/TextAppearance.GEN_EditLabel" 
-        android:id="@+id/checkbox_twitter"
-        android:text="@string/actfm_EPA_twitter"
-        android:paddingLeft="45dip"
-        android:visibility="gone"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <View
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:layout_margin="15dip"
-        android:background="@android:drawable/divider_horizontal_dark" />
-      <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="15dip"
-        android:text="@string/actfm_EPA_intro"
-        android:gravity="center"
-        android:textColor="#ee9900" />
-    </LinearLayout>
-  </ScrollView>
+  	<!-- Header -->
+    <LinearLayout 
+        android:id="@+id/edit_header"
+	    android:layout_width="fill_parent" 
+	    android:layout_height="43dip"
+	    android:layout_weight="1"
+	    android:orientation="horizontal"
+	    android:layout_alignParentTop="true">
 
-  <!-- ====================================================== tab: alarms == -->
-  <ScrollView
-    android:id="@+id/tab_alarms"
-    android:layout_above="@id/edit_footer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-      android:padding="4dip"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-      <!-- reminders -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_reminder_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <CheckBox
-        style="@style/TextAppearance.GEN_EditLabel" 
-        android:id="@+id/reminder_due"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:button="@drawable/btn_check_small"       
-        android:text="@string/TEA_reminder_due" />
-      <CheckBox
-        style="@style/TextAppearance.GEN_EditLabel" 
-        android:id="@+id/reminder_overdue"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:button="@drawable/btn_check_small"       
-        android:text="@string/TEA_reminder_overdue" />
-      <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
-        <CheckBox
-          style="@style/TextAppearance.GEN_EditLabel"   
-          android:id="@+id/reminder_random"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginLeft="5dip"
-          android:button="@drawable/btn_check_small"       
-          android:text="@string/TEA_reminder_random" />
-        <Spinner
-          android:id="@+id/reminder_random_interval"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content" />
-      </LinearLayout>
-      <!-- reminder mode -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_reminder_alarm_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <Spinner
-        android:id="@+id/reminder_alarm"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <!-- add-ons -->
-      <LinearLayout
-        android:id="@+id/addons_alarms"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
-    </LinearLayout>
-  </ScrollView>
-  
-  <!-- ======================================================= tab: more == -->
-  <ScrollView
-    android:id="@+id/tab_more"
-    android:layout_above="@id/edit_footer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-      android:padding="4dip"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-      <!-- hide until -->
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/TEA_hideUntil_label"
-        style="@style/TextAppearance.GEN_EditLabel" />
-      <Spinner
-        android:id="@+id/hideUntil"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-      <!-- add-ons -->
-      <LinearLayout
-        android:id="@+id/addons_more"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-        <LinearLayout
-          android:id="@+id/addons_empty"
-          android:layout_width="fill_parent"
-          android:layout_height="fill_parent"
-          android:layout_weight="100"
-          android:gravity="center"
-          android:visibility="gone"
-          android:orientation="vertical">
-          <ImageView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:padding="20dip"
-            android:src="@drawable/icon_pp" />
-          <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/TEA_addons_text"
-            android:padding="10dip"
-            android:gravity="center"
-            style="@style/TextAppearance.TLA_NoItems" />
-          <Button
-            android:id="@+id/addons_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="10dip"
-            android:text="@string/TEA_addons_button" />
+	    <LinearLayout
+	        style="@style/Header"
+	        android:layout_width="fill_parent" 
+	        android:layout_height="fill_parent"
+	        android:layout_weight="1"
+	        android:orientation="horizontal">
+	    
+	        
+	        <!-- Header Logo -->
+	        <ImageView android:id="@+id/headerLogo"
+	            android:layout_width="fill_parent"
+	            android:layout_height="fill_parent"
+	            android:layout_weight="100"
+	            android:gravity="center"
+	            android:paddingRight="43dip"
+	            android:src="@drawable/header_logo_new"
+	            android:scaleType="center"
+	            android:visibility="gone"/>
+	           
+	        <!-- List Label -->
+	        <TextView android:id="@+id/taskLabel"
+	            android:layout_width="fill_parent"
+	            android:layout_height="fill_parent"
+	            android:layout_weight="100"
+	            android:singleLine="true"
+	            android:ellipsize="end"
+	            android:gravity="center"
+	            style="@style/TextAppearance.TLA_Header"/>    
+	            
+	    </LinearLayout>
+	   
+	   <LinearLayout android:id="@+id/activityContainer"
+           android:layout_width="wrap_content"
+           android:layout_height="fill_parent"
+           android:visibility="gone">
+            <View 
+               android:layout_width="0.5dip"
+               android:layout_height="fill_parent"
+               android:background="#ff222222"/>
+               
+            <ImageView android:id="@+id/activity"
+                android:layout_height="fill_parent"
+                android:layout_width="43dip"
+                android:background="?attr/asHeaderButtonBackground"
+                android:padding="7dip"
+                android:src="@drawable/icn_cmmt_off"
+                android:scaleType="fitCenter" /> 
         </LinearLayout>
-      </LinearLayout>
+	    
     </LinearLayout>
-  </ScrollView>
-
-
-</RelativeLayout>
\ No newline at end of file
+  
+    <!-- buttons -->
+	<LinearLayout android:id="@+id/edit_footer"
+	  android:orientation="horizontal"
+	  android:layout_width="fill_parent"
+	  android:layout_height="48dip"
+	  android:layout_alignParentBottom="true"
+	  android:padding="5dip"
+	  android:background="@drawable/footer_background"
+	  android:baselineAligned="false">
+	  <Button
+	    android:id="@+id/save"
+	    android:layout_width="fill_parent"
+	    android:layout_height="fill_parent"
+	    android:layout_marginRight="5dip"
+	    android:background="@drawable/footer_editbutton"
+	    android:text="@string/DLG_save"
+	    android:textStyle="bold"
+	    style="@style/TextAppearance.TEA_action"
+	    android:layout_weight="1" />
+	  <Button
+	    android:id="@+id/discard"
+	    android:layout_width="fill_parent"
+	    android:layout_height="fill_parent"
+	    android:layout_marginLeft="5dip"
+	    android:background="@drawable/footer_editbutton"
+	    android:text="@android:string/cancel"
+	    style="@style/TextAppearance.TEA_action"
+	    android:textColor="#000000"
+	    android:layout_weight="1" />
+	</LinearLayout>
+        
+	<ScrollView
+	  android:id="@+id/edit_scroll"
+	  android:layout_below="@id/edit_header"
+	  android:layout_above="@id/edit_footer"
+	  android:layout_width="fill_parent"
+	  android:layout_height="fill_parent"
+	  style="@style/Content">
+	    
+	  <LinearLayout 
+	    android:orientation="vertical" 
+	    android:padding="10dip"
+	    android:layout_width="fill_parent" 
+	    android:layout_height="fill_parent">
+	    
+		<LinearLayout 
+		  android:id="@+id/basic_controls"
+		  android:layout_width="fill_parent"
+		  android:layout_height="fill_parent"
+		  android:orientation="vertical">
+		</LinearLayout>
+	    
+	    <LinearLayout
+	      android:id="@+id/when_container"
+	      android:layout_width="fill_parent"
+	      android:layout_height="wrap_content"
+	      android:orientation="vertical">
+	       
+	        <LinearLayout
+	          android:id="@+id/when_header"
+	          android:layout_width="fill_parent"
+	          android:layout_height="50dip"
+	          android:gravity="center_vertical">
+	          <LinearLayout
+	              android:id="@+id/when_shortcut_container"
+	              android:layout_width="wrap_content"
+	              android:layout_height="fill_parent"
+	              android:orientation="horizontal"
+	              android:gravity="center_vertical">
+		          <ImageView 
+		             android:id="@+id/when_image"
+		             style="@style/EditRowImage"
+		             android:src="@drawable/icn_edit_when"/>
+		          <TextView
+		            android:id="@+id/when_label"
+		            android:layout_width="wrap_content"
+		            android:layout_height="wrap_content"
+		            style="@style/TextAppearance.GEN_EditLabel"
+		            android:text="@string/TEA_when_header_label"/>
+	          </LinearLayout>
+	          <TextView
+	            android:id="@+id/aux_date"
+	            android:layout_width="fill_parent"
+	            android:layout_height="wrap_content"
+	            android:layout_weight="100"
+	            android:gravity="right"
+	            style="@style/TextAppearance.EditRowDisplay"/>
+	          <include layout="@layout/task_edit_arrow"/>
+	        </LinearLayout>
+	      
+	        <View
+		      android:layout_width="fill_parent"
+		      android:layout_height="1px"
+		      android:padding="5dip"
+		      style="@style/TEA_Separator" />
+			  
+		</LinearLayout>
+		
+		<LinearLayout
+	      android:layout_width="fill_parent"
+	      android:layout_height="wrap_content"
+	      android:orientation="vertical">
+	       
+	        <LinearLayout
+	          android:id="@+id/more_header"
+	          android:layout_width="fill_parent"
+	          android:layout_height="fill_parent"
+	          android:orientation="vertical">
+	          
+	          <TextView
+	            android:layout_width="fill_parent"
+	            android:layout_height="50dip"
+	            android:layout_gravity="center_vertical"
+	            android:gravity="center"
+	            style="@style/TextAppearance.EditRowDisplay"
+	            android:textStyle="bold"
+	            android:text="@string/TEA_more"/>
+		        <View
+			      android:layout_width="fill_parent"
+			      android:layout_height="1px"
+			      android:padding="5dip"
+			      style="@style/TEA_Separator" />
+	        </LinearLayout>
+	        
+	      
+	        <LinearLayout
+		      android:id="@+id/more_controls"
+		      android:layout_width="fill_parent"
+		      android:layout_height="fill_parent"
+		      android:orientation="vertical"
+		      android:visibility="gone"/>
+	          
+	    </LinearLayout>
+	  </LinearLayout>
+	</ScrollView>
+</RelativeLayout>
diff --git a/astrid/res/layout/task_edit_activity_new.xml b/astrid/res/layout/task_edit_activity_new.xml
deleted file mode 100644
index a6718906c..000000000
--- a/astrid/res/layout/task_edit_activity_new.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-  android:id="@+id/taskEditParent"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
-  style="@style/Content">
-  
-  	<!-- Header -->
-    <LinearLayout 
-        android:id="@+id/edit_header"
-	    android:layout_width="fill_parent" 
-	    android:layout_height="43dip"
-	    android:layout_weight="1"
-	    android:orientation="horizontal"
-	    android:layout_alignParentTop="true">
-
-	    <LinearLayout
-	        style="@style/Header"
-	        android:layout_width="fill_parent" 
-	        android:layout_height="fill_parent"
-	        android:layout_weight="1"
-	        android:orientation="horizontal">
-	    
-	        
-	        <!-- Header Logo -->
-	        <ImageView android:id="@+id/headerLogo"
-	            android:layout_width="fill_parent"
-	            android:layout_height="fill_parent"
-	            android:layout_weight="100"
-	            android:gravity="center"
-	            android:paddingRight="43dip"
-	            android:src="@drawable/header_logo_new"
-	            android:scaleType="center"
-	            android:visibility="gone"/>
-	           
-	        <!-- List Label -->
-	        <TextView android:id="@+id/taskLabel"
-	            android:layout_width="fill_parent"
-	            android:layout_height="fill_parent"
-	            android:layout_weight="100"
-	            android:singleLine="true"
-	            android:ellipsize="end"
-	            android:gravity="center"
-	            style="@style/TextAppearance.TLA_Header"/>    
-	            
-	    </LinearLayout>
-	   
-	   <LinearLayout android:id="@+id/activityContainer"
-           android:layout_width="wrap_content"
-           android:layout_height="fill_parent"
-           android:visibility="gone">
-            <View 
-               android:layout_width="0.5dip"
-               android:layout_height="fill_parent"
-               android:background="#ff222222"/>
-               
-            <ImageView android:id="@+id/activity"
-                android:layout_height="fill_parent"
-                android:layout_width="43dip"
-                android:background="?attr/asHeaderButtonBackground"
-                android:padding="7dip"
-                android:src="@drawable/icn_cmmt_off"
-                android:scaleType="fitCenter" /> 
-        </LinearLayout>
-	    
-    </LinearLayout>
-  
-    <!-- buttons -->
-	<LinearLayout android:id="@+id/edit_footer"
-	  android:orientation="horizontal"
-	  android:layout_width="fill_parent"
-	  android:layout_height="48dip"
-	  android:layout_alignParentBottom="true"
-	  android:padding="5dip"
-	  android:background="@drawable/footer_background"
-	  android:baselineAligned="false">
-	  <Button
-	    android:id="@+id/save"
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent"
-	    android:layout_marginRight="5dip"
-	    android:background="@drawable/footer_editbutton"
-	    android:text="@string/DLG_save"
-	    android:textStyle="bold"
-	    style="@style/TextAppearance.TEA_action"
-	    android:layout_weight="1" />
-	  <Button
-	    android:id="@+id/discard"
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent"
-	    android:layout_marginLeft="5dip"
-	    android:background="@drawable/footer_editbutton"
-	    android:text="@android:string/cancel"
-	    style="@style/TextAppearance.TEA_action"
-	    android:textColor="#000000"
-	    android:layout_weight="1" />
-	</LinearLayout>
-        
-	<ScrollView
-	  android:id="@+id/edit_scroll"
-	  android:layout_below="@id/edit_header"
-	  android:layout_above="@id/edit_footer"
-	  android:layout_width="fill_parent"
-	  android:layout_height="fill_parent"
-	  style="@style/Content">
-	    
-	  <LinearLayout 
-	    android:orientation="vertical" 
-	    android:padding="10dip"
-	    android:layout_width="fill_parent" 
-	    android:layout_height="fill_parent">
-	    
-		<LinearLayout 
-		  android:id="@+id/basic_controls"
-		  android:layout_width="fill_parent"
-		  android:layout_height="fill_parent"
-		  android:orientation="vertical">
-		</LinearLayout>
-	    
-	    <LinearLayout
-	      android:id="@+id/when_container"
-	      android:layout_width="fill_parent"
-	      android:layout_height="wrap_content"
-	      android:orientation="vertical">
-	       
-	        <LinearLayout
-	          android:id="@+id/when_header"
-	          android:layout_width="fill_parent"
-	          android:layout_height="50dip"
-	          android:gravity="center_vertical">
-	          <LinearLayout
-	              android:id="@+id/when_shortcut_container"
-	              android:layout_width="wrap_content"
-	              android:layout_height="fill_parent"
-	              android:orientation="horizontal"
-	              android:gravity="center_vertical">
-		          <ImageView 
-		             android:id="@+id/when_image"
-		             style="@style/EditRowImage"
-		             android:src="@drawable/icn_edit_when"/>
-		          <TextView
-		            android:id="@+id/when_label"
-		            android:layout_width="wrap_content"
-		            android:layout_height="wrap_content"
-		            style="@style/TextAppearance.GEN_EditLabel"
-		            android:text="@string/TEA_when_header_label"/>
-	          </LinearLayout>
-	          <TextView
-	            android:id="@+id/aux_date"
-	            android:layout_width="fill_parent"
-	            android:layout_height="wrap_content"
-	            android:layout_weight="100"
-	            android:gravity="right"
-	            style="@style/TextAppearance.EditRowDisplay"/>
-	          <include layout="@layout/task_edit_arrow"/>
-	        </LinearLayout>
-	      
-	        <View
-		      android:layout_width="fill_parent"
-		      android:layout_height="1px"
-		      android:padding="5dip"
-		      style="@style/TEA_Separator" />
-			  
-		</LinearLayout>
-		
-		<LinearLayout
-	      android:layout_width="fill_parent"
-	      android:layout_height="wrap_content"
-	      android:orientation="vertical">
-	       
-	        <LinearLayout
-	          android:id="@+id/more_header"
-	          android:layout_width="fill_parent"
-	          android:layout_height="fill_parent"
-	          android:orientation="vertical">
-	          
-	          <TextView
-	            android:layout_width="fill_parent"
-	            android:layout_height="50dip"
-	            android:layout_gravity="center_vertical"
-	            android:gravity="center"
-	            style="@style/TextAppearance.EditRowDisplay"
-	            android:textStyle="bold"
-	            android:text="@string/TEA_more"/>
-		        <View
-			      android:layout_width="fill_parent"
-			      android:layout_height="1px"
-			      android:padding="5dip"
-			      style="@style/TEA_Separator" />
-	        </LinearLayout>
-	        
-	      
-	        <LinearLayout
-		      android:id="@+id/more_controls"
-		      android:layout_width="fill_parent"
-		      android:layout_height="fill_parent"
-		      android:orientation="vertical"
-		      android:visibility="gone"/>
-	          
-	    </LinearLayout>
-	  </LinearLayout>
-	</ScrollView>
-</RelativeLayout>
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index 9627d26ba..3b92d3b2d 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -248,7 +248,7 @@ public final class TaskEditActivity extends Activity {
 
     /** Initialize UI components */
     private void setUpUIComponents() {
-        setContentView(R.layout.task_edit_activity_new);
+        setContentView(R.layout.task_edit_activity);
         scrollView = (ScrollView) findViewById(R.id.edit_scroll);
 
         LinearLayout basicControls = (LinearLayout) findViewById(R.id.basic_controls);
@@ -415,36 +415,9 @@ public final class TaskEditActivity extends Activity {
             Button saveButtonGeneral = (Button) findViewById(R.id.save);
             saveButtonGeneral.setOnClickListener(mSaveListener);
 
-            Button saveButton2 = (Button) findViewById(R.id.save2);
-            Button saveButton3 = (Button) findViewById(R.id.save3);
-            Button saveButton4 = (Button) findViewById(R.id.save4);
-            if (saveButton2 != null) {
-                saveButton2.setOnClickListener(mSaveListener);
-            }
-            if (saveButton3 != null) {
-                saveButton3.setOnClickListener(mSaveListener);
-            }
-            if (saveButton4 != null) {
-                saveButton4.setOnClickListener(mSaveListener);
-            }
-
-
             Button discardButtonGeneral = (Button) findViewById(R.id.discard);
             discardButtonGeneral.setOnClickListener(mDiscardListener);
 
-            Button discardButton2 = (Button) findViewById(R.id.discard2);
-            Button discardButton3 = (Button) findViewById(R.id.discard3);
-            Button discardButton4 = (Button) findViewById(R.id.discard4);
-            if (discardButton2 != null) {
-                discardButton2.setOnClickListener(mDiscardListener);
-            }
-            if (discardButton3 != null) {
-                discardButton3.setOnClickListener(mDiscardListener);
-            }
-            if (discardButton4 != null) {
-                discardButton4.setOnClickListener(mDiscardListener);
-            }
-
             findViewById(R.id.when_header).setOnClickListener(mExpandWhenListener);
 
             findViewById(R.id.more_header).setOnClickListener(mExpandMoreListener);
@@ -501,23 +474,6 @@ public final class TaskEditActivity extends Activity {
                 voiceNoteAssistant.configureMicrophoneButton(prompt);
             }
 
-//            if(!Constants.MARKET_DISABLED && !addOnService.hasPowerPack()) {
-//                // show add-on help if necessary
-//                View addonsEmpty = findViewById(R.id.addons_empty);
-//                addonsEmpty.setVisibility(View.VISIBLE);
-//                moreAddons.removeView(addonsEmpty);
-//                moreAddons.addView(addonsEmpty);
-//                ((Button)findViewById(R.id.addons_button)).setOnClickListener(new View.OnClickListener() {
-//                    @Override
-//                    public void onClick(View v) {
-//                        Intent addOnActivity = new Intent(TaskEditActivity.this, AddOnActivity.class);
-//                        addOnActivity.putExtra(AddOnActivity.TOKEN_START_WITH_AVAILABLE, true);
-//                        startActivity(addOnActivity);
-//                    }
-//                });
-//            }
-
-
             // re-read all
             synchronized(controls) {
                 for(TaskEditControlSet controlSet : controls)
@@ -712,10 +668,6 @@ public final class TaskEditActivity extends Activity {
                 separator.setPadding(5, 5, 5, 5);
                 separator.setBackgroundResource(android.R.drawable.divider_horizontal_dark);
 
-                LinearLayout dest = (LinearLayout)findViewById(R.id.addons_more);
-                dest.addView(separator);
-                view.apply(TaskEditActivity.this, dest);
-
             } catch (Exception e) {
                 exceptionService.reportError("receive-detail-" + //$NON-NLS-1$
                         intent.getStringExtra(AstridApiConstants.EXTRAS_ADDON), e);