diff --git a/astrid/res/layout/sort_selection_dialog.xml b/astrid/res/layout/sort_selection_dialog.xml
new file mode 100644
index 000000000..ace8e3cca
--- /dev/null
+++ b/astrid/res/layout/sort_selection_dialog.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See the file "LICENSE" for the full license governing this code. -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content">
+
+    <LinearLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical">
+            
+      <!-- hidden task status -->
+        
+      <CheckBox android:id="@+id/hidden"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/SSD_hidden" />
+      
+      <CheckBox android:id="@+id/completed"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/SSD_completed" />
+        
+      <CheckBox android:id="@+id/deleted"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/SSD_deleted" />
+  
+      <!-- Sorting -->
+            
+      <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="1dip"
+        android:padding="5dip"
+        android:text="@string/SSD_sort_header"
+        style="@style/TextAppearance.FLA_Header" />
+    
+      <RadioGroup
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        
+        <RadioButton android:id="@+id/sort_smart"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:text="@string/SSD_sort_auto" />
+        
+        <RadioButton android:id="@+id/sort_due"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:text="@string/SSD_sort_due" />
+        
+        <RadioButton android:id="@+id/sort_importance"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:text="@string/SSD_sort_importance" />
+        
+        <RadioButton android:id="@+id/sort_alpha"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:text="@string/SSD_sort_alpha" />
+        
+        <RadioButton android:id="@+id/sort_modified"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:text="@string/SSD_sort_modified" />
+          
+      </RadioGroup>
+      
+      <CheckBox android:id="@+id/reverse"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/SSD_sort_reverse" />
+          
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/astrid/res/values-ca/strings.xml b/astrid/res/values-ca/strings.xml
index 71348978d..90c6ac386 100644
--- a/astrid/res/values-ca/strings.xml
+++ b/astrid/res/values-ca/strings.xml
@@ -624,25 +624,25 @@ to the plugin creator for fastest service.
     <string name="BFE_Extended">More...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Recently Modified</string>
+    <string name="SSD_sort_modified">Recently Modified</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">Tasques Completades</string>
+    <string name="SSD_completed">Tasques Completades</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Hidden Tasks</string>
+    <string name="SSD_hidden">Hidden Tasks</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">By Title</string>
+    <string name="SSD_sort_alpha">By Title</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">By Due Date</string>
+    <string name="SSD_sort_due">By Due Date</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">By Importance</string>
+    <string name="SSD_sort_importance">By Importance</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Deleted Tasks</string>
+    <string name="SSD_deleted">Deleted Tasks</string>
         
 
 
diff --git a/astrid/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml
index 29cda16c5..dde7a8963 100644
--- a/astrid/res/values-cs/strings.xml
+++ b/astrid/res/values-cs/strings.xml
@@ -617,25 +617,25 @@ to the plugin creator for fastest service.
     <string name="BFE_Extended">Více...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Nedávno upravené</string>
+    <string name="SSD_sort_modified">Nedávno upravené</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">Dokončené úkoly</string>
+    <string name="SSD_completed">Dokončené úkoly</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Skryté úkoly</string>
+    <string name="SSD_hidden">Skryté úkoly</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">Podle názvu</string>
+    <string name="SSD_sort_alpha">Podle názvu</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">Podle data ukončení</string>
+    <string name="SSD_sort_due">Podle data ukončení</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">Podle důležitosti</string>
+    <string name="SSD_sort_importance">Podle důležitosti</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Smazané úkoly</string>
+    <string name="SSD_deleted">Smazané úkoly</string>
         
 
 
diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index 2c136c46e..1601acdc0 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -617,25 +617,25 @@ to the plugin creator for fastest service.
     <string name="BFE_Extended">Mehr...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Kürzlich bearbeitet</string>
+    <string name="SSD_sort_modified">Kürzlich bearbeitet</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">Erledigte Aufgaben</string>
+    <string name="SSD_completed">Erledigte Aufgaben</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Versteckte Aufgaben</string>
+    <string name="SSD_hidden">Versteckte Aufgaben</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">Nach Titel</string>
+    <string name="SSD_sort_alpha">Nach Titel</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">Nach Fälligkeit</string>
+    <string name="SSD_sort_due">Nach Fälligkeit</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">Nach Wichtigkeit</string>
+    <string name="SSD_sort_importance">Nach Wichtigkeit</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Gelöschte Aufgaben</string>
+    <string name="SSD_deleted">Gelöschte Aufgaben</string>
         
 
 
diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml
index 702569171..710a8e38c 100644
--- a/astrid/res/values-es/strings.xml
+++ b/astrid/res/values-es/strings.xml
@@ -618,25 +618,25 @@ Si puede añada Astrid a la lista de exclusión de modo que no sea matada. De ot
     <string name="BFE_Extended">Más…</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Recientemente modificado</string>
+    <string name="SSD_sort_modified">Recientemente modificado</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">Tareas Finalizadas</string>
+    <string name="SSD_completed">Tareas Finalizadas</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Tareas ocultas</string>
+    <string name="SSD_hidden">Tareas ocultas</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">Por título</string>
+    <string name="SSD_sort_alpha">Por título</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">Por fecha de vencimiento</string>
+    <string name="SSD_sort_due">Por fecha de vencimiento</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">Por importancia</string>
+    <string name="SSD_sort_importance">Por importancia</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Tareas eliminadas</string>
+    <string name="SSD_deleted">Tareas eliminadas</string>
         
 
 
diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml
index 0cc65337e..b561a83f0 100644
--- a/astrid/res/values-fr/strings.xml
+++ b/astrid/res/values-fr/strings.xml
@@ -617,25 +617,25 @@ to the plugin creator for fastest service.
     <string name="BFE_Extended">Plus...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Récemment modifié</string>
+    <string name="SSD_sort_modified">Récemment modifié</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">Tâches complétées</string>
+    <string name="SSD_completed">Tâches complétées</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Tâches masquées</string>
+    <string name="SSD_hidden">Tâches masquées</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">Par Titre</string>
+    <string name="SSD_sort_alpha">Par Titre</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">Par date d\'échéance</string>
+    <string name="SSD_sort_due">Par date d\'échéance</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">Par priorité</string>
+    <string name="SSD_sort_importance">Par priorité</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Tâches supprimées</string>
+    <string name="SSD_deleted">Tâches supprimées</string>
         
 
 
diff --git a/astrid/res/values-id/strings.xml b/astrid/res/values-id/strings.xml
index 060560d0e..18e7f872b 100644
--- a/astrid/res/values-id/strings.xml
+++ b/astrid/res/values-id/strings.xml
@@ -631,25 +631,25 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
     <string name="BFE_Extended">More...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Recently Modified</string>
+    <string name="SSD_sort_modified">Recently Modified</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">Tugas Selesai</string>
+    <string name="SSD_completed">Tugas Selesai</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Hidden Tasks</string>
+    <string name="SSD_hidden">Hidden Tasks</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">By Title</string>
+    <string name="SSD_sort_alpha">By Title</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">By Due Date</string>
+    <string name="SSD_sort_due">By Due Date</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">By Importance</string>
+    <string name="SSD_sort_importance">By Importance</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Deleted Tasks</string>
+    <string name="SSD_deleted">Deleted Tasks</string>
         
 
 
diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index acfdd12a7..3c4316be0 100644
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -620,25 +620,25 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
     <string name="BFE_Extended">Altri...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Modificato di recente</string>
+    <string name="SSD_sort_modified">Modificato di recente</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">Attività Completate</string>
+    <string name="SSD_completed">Attività Completate</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Attività Nascoste</string>
+    <string name="SSD_hidden">Attività Nascoste</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">Per Titotlo</string>
+    <string name="SSD_sort_alpha">Per Titotlo</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">Per scadenza</string>
+    <string name="SSD_sort_due">Per scadenza</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">Per Importanza</string>
+    <string name="SSD_sort_importance">Per Importanza</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Attività Eliminate</string>
+    <string name="SSD_deleted">Attività Eliminate</string>
         
 
 
diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml
index ad0f3074f..d3b231671 100644
--- a/astrid/res/values-ja/strings.xml
+++ b/astrid/res/values-ja/strings.xml
@@ -622,25 +622,25 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
     <string name="BFE_Extended">その他のフィルタ</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">最近編集したタスク</string>
+    <string name="SSD_sort_modified">最近編集したタスク</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">完了したタスク</string>
+    <string name="SSD_completed">完了したタスク</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">非表示のタスク</string>
+    <string name="SSD_hidden">非表示のタスク</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">タイトル順</string>
+    <string name="SSD_sort_alpha">タイトル順</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">期限順</string>
+    <string name="SSD_sort_due">期限順</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">重要度順</string>
+    <string name="SSD_sort_importance">重要度順</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">削除したタスク</string>
+    <string name="SSD_deleted">削除したタスク</string>
         
 
 
diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml
index 4ba826268..d2ef0d695 100644
--- a/astrid/res/values-ko/strings.xml
+++ b/astrid/res/values-ko/strings.xml
@@ -628,25 +628,25 @@ Astrid might not let you know when your tasks are due.\n
     <string name="BFE_Extended">More...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Recently Modified</string>
+    <string name="SSD_sort_modified">Recently Modified</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">완료된 할일</string>
+    <string name="SSD_completed">완료된 할일</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Hidden Tasks</string>
+    <string name="SSD_hidden">Hidden Tasks</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">By Title</string>
+    <string name="SSD_sort_alpha">By Title</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">By Due Date</string>
+    <string name="SSD_sort_due">By Due Date</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">By Importance</string>
+    <string name="SSD_sort_importance">By Importance</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Deleted Tasks</string>
+    <string name="SSD_deleted">Deleted Tasks</string>
         
 
 
diff --git a/astrid/res/values-nb/strings.xml b/astrid/res/values-nb/strings.xml
index 1b0ce8f12..84f93483d 100644
--- a/astrid/res/values-nb/strings.xml
+++ b/astrid/res/values-nb/strings.xml
@@ -617,25 +617,25 @@ to the plugin creator for fastest service.
     <string name="BFE_Extended">Mer...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Nylig endret</string>
+    <string name="SSD_sort_modified">Nylig endret</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">Fullførte oppgaver</string>
+    <string name="SSD_completed">Fullførte oppgaver</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Skjulte oppgaver</string>
+    <string name="SSD_hidden">Skjulte oppgaver</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">Etter tittel</string>
+    <string name="SSD_sort_alpha">Etter tittel</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">Etter forfallsdato</string>
+    <string name="SSD_sort_due">Etter forfallsdato</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">Etter viktighet</string>
+    <string name="SSD_sort_importance">Etter viktighet</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Slettede oppgaver</string>
+    <string name="SSD_deleted">Slettede oppgaver</string>
         
 
 
diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index bc83bb88c..242a32ca4 100644
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -631,25 +631,25 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
     <string name="BFE_Extended">More...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Recently Modified</string>
+    <string name="SSD_sort_modified">Recently Modified</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">Afgeronde taken</string>
+    <string name="SSD_completed">Afgeronde taken</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Hidden Tasks</string>
+    <string name="SSD_hidden">Hidden Tasks</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">By Title</string>
+    <string name="SSD_sort_alpha">By Title</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">By Due Date</string>
+    <string name="SSD_sort_due">By Due Date</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">By Importance</string>
+    <string name="SSD_sort_importance">By Importance</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Deleted Tasks</string>
+    <string name="SSD_deleted">Deleted Tasks</string>
         
 
 
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index c2e4e9b11..bfc4437d9 100644
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -628,25 +628,25 @@ Astrid might not let you know when your tasks are due.\n
     <string name="BFE_Extended">More...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Recently Modified</string>
+    <string name="SSD_sort_modified">Recently Modified</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">Zakończone zadania</string>
+    <string name="SSD_completed">Zakończone zadania</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Hidden Tasks</string>
+    <string name="SSD_hidden">Hidden Tasks</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">By Title</string>
+    <string name="SSD_sort_alpha">By Title</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">By Due Date</string>
+    <string name="SSD_sort_due">By Due Date</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">By Importance</string>
+    <string name="SSD_sort_importance">By Importance</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Deleted Tasks</string>
+    <string name="SSD_deleted">Deleted Tasks</string>
         
 
 
diff --git a/astrid/res/values-pt/strings.xml b/astrid/res/values-pt/strings.xml
index 7d2b92920..3b529c262 100644
--- a/astrid/res/values-pt/strings.xml
+++ b/astrid/res/values-pt/strings.xml
@@ -621,25 +621,25 @@ Astrid might not let you know when your tasks are due.\n
     <string name="BFE_Extended">Mais...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Recently Modified</string>
+    <string name="SSD_sort_modified">Recently Modified</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">Tarefas Terminadas</string>
+    <string name="SSD_completed">Tarefas Terminadas</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Hidden Tasks</string>
+    <string name="SSD_hidden">Hidden Tasks</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">Por Título</string>
+    <string name="SSD_sort_alpha">Por Título</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">By Due Date</string>
+    <string name="SSD_sort_due">By Due Date</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">By Importance</string>
+    <string name="SSD_sort_importance">By Importance</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Deleted Tasks</string>
+    <string name="SSD_deleted">Deleted Tasks</string>
         
 
 
diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml
index 4be750e73..24ee0b922 100644
--- a/astrid/res/values-ru/strings.xml
+++ b/astrid/res/values-ru/strings.xml
@@ -620,25 +620,25 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
     <string name="BFE_Extended">Ещё...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Недавно изменённые</string>
+    <string name="SSD_sort_modified">Недавно изменённые</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">Завершённые задачи</string>
+    <string name="SSD_completed">Завершённые задачи</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Скрытые задачи</string>
+    <string name="SSD_hidden">Скрытые задачи</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">По названию</string>
+    <string name="SSD_sort_alpha">По названию</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">По намеченному сроку</string>
+    <string name="SSD_sort_due">По намеченному сроку</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">По уровню важности</string>
+    <string name="SSD_sort_importance">По уровню важности</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Удалённые задачи</string>
+    <string name="SSD_deleted">Удалённые задачи</string>
         
 
 
diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml
index bb5c42c59..c473ed31a 100644
--- a/astrid/res/values-sv/strings.xml
+++ b/astrid/res/values-sv/strings.xml
@@ -631,25 +631,25 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
     <string name="BFE_Extended">More...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Recently Modified</string>
+    <string name="SSD_sort_modified">Recently Modified</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">Färdiga uppgifter</string>
+    <string name="SSD_completed">Färdiga uppgifter</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Hidden Tasks</string>
+    <string name="SSD_hidden">Hidden Tasks</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">By Title</string>
+    <string name="SSD_sort_alpha">By Title</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">By Due Date</string>
+    <string name="SSD_sort_due">By Due Date</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">By Importance</string>
+    <string name="SSD_sort_importance">By Importance</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Deleted Tasks</string>
+    <string name="SSD_deleted">Deleted Tasks</string>
         
 
 
diff --git a/astrid/res/values-tr/strings.xml b/astrid/res/values-tr/strings.xml
index 51bb553cc..3cb861fa2 100644
--- a/astrid/res/values-tr/strings.xml
+++ b/astrid/res/values-tr/strings.xml
@@ -631,25 +631,25 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
     <string name="BFE_Extended">More...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Recently Modified</string>
+    <string name="SSD_sort_modified">Recently Modified</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">Tamamlanmış Görevler</string>
+    <string name="SSD_completed">Tamamlanmış Görevler</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Hidden Tasks</string>
+    <string name="SSD_hidden">Hidden Tasks</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">By Title</string>
+    <string name="SSD_sort_alpha">By Title</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">By Due Date</string>
+    <string name="SSD_sort_due">By Due Date</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">By Importance</string>
+    <string name="SSD_sort_importance">By Importance</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Deleted Tasks</string>
+    <string name="SSD_deleted">Deleted Tasks</string>
         
 
 
diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml
index 255eb0d51..39212c76e 100644
--- a/astrid/res/values-zh-rCN/strings.xml
+++ b/astrid/res/values-zh-rCN/strings.xml
@@ -631,25 +631,25 @@ you get stuff done. It features reminders, tags, sync, a widget and more.
     <string name="BFE_Extended">More...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">Recently Modified</string>
+    <string name="SSD_sort_modified">Recently Modified</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">已完成的任务</string>
+    <string name="SSD_completed">已完成的任务</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">Hidden Tasks</string>
+    <string name="SSD_hidden">Hidden Tasks</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">By Title</string>
+    <string name="SSD_sort_alpha">By Title</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">By Due Date</string>
+    <string name="SSD_sort_due">By Due Date</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">By Importance</string>
+    <string name="SSD_sort_importance">By Importance</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">Deleted Tasks</string>
+    <string name="SSD_deleted">Deleted Tasks</string>
         
 
 
diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml
index 15ed396b3..7c2dccc15 100644
--- a/astrid/res/values-zh-rTW/strings.xml
+++ b/astrid/res/values-zh-rTW/strings.xml
@@ -617,25 +617,25 @@ to the plugin creator for fastest service.
     <string name="BFE_Extended">更多...</string>
 
     <!-- sort recent modification filter -->
-    <string name="BFE_Recent">最近修改過</string>
+    <string name="SSD_sort_modified">最近修改過</string>
     
     <!-- Completed Filter -->
-    <string name="BFE_Completed">已完成的工作</string>
+    <string name="SSD_completed">已完成的工作</string>
 
     <!-- hidden tasks filter -->
-    <string name="BFE_Hidden">隱藏的工作</string>
+    <string name="SSD_hidden">隱藏的工作</string>
 
     <!-- sort Alphabetical filter -->
-    <string name="BFE_Alphabetical">依主旨</string>
+    <string name="SSD_sort_alpha">依主旨</string>
 
     <!-- sort Due Date filter -->
-    <string name="BFE_DueDate">依到期日</string>
+    <string name="SSD_sort_due">依到期日</string>
 
     <!-- sort Importance filter -->
-    <string name="BFE_Importance">依重要性</string>
+    <string name="SSD_sort_importance">依重要性</string>
 
     <!-- deleted tasks filter -->
-    <string name="BFE_Deleted">刪除的工作</string>
+    <string name="SSD_deleted">刪除的工作</string>
         
 
 
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index c96065851..7ac606884 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -156,6 +156,9 @@
   <!-- Menu: Add-ons -->    
   <string name="TLA_menu_addons">Add-ons</string>
   
+  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
+  <string name="TLA_menu_sort">Sort &amp; Hidden</string>
+  
   <!-- Menu: Settings -->    
   <string name="TLA_menu_settings">Settings</string>
   
@@ -209,6 +212,47 @@ button: add task & go to the edit page.
   <!-- Context Item: undelete task -->
   <string name="TAd_contextUndeleteTask">Undelete Task</string>
   
+  <!-- ============================================== SortSelectionDialog == -->
+  
+  <!-- Sort Selection: dialog title -->    
+  <string name="SSD_title">Sorting and Hidden Tasks</string>
+  
+  <!-- Hidden Task Selection: show completed tasks -->    
+  <string name="SSD_completed">Show Completed Tasks</string>
+  
+  <!-- Hidden Task Selection: show hidden tasks -->    
+  <string name="SSD_hidden">Show Hidden Tasks</string>
+  
+  <!-- Hidden Task Selection: show deleted tasks -->    
+  <string name="SSD_deleted">Show Deleted Tasks</string>
+  
+  <!-- Sort Selection: sort options header -->    
+  <string name="SSD_sort_header">Sort Options</string>
+  
+  <!-- Sort Selection: smart sort -->
+  <string name="SSD_sort_auto">Astrid Smart Sort</string>
+  
+  <!-- Sort Selection: sort by alpha -->
+  <string name="SSD_sort_alpha">By Title</string>
+  
+  <!-- Sort Selection: sort by due date -->
+  <string name="SSD_sort_due">By Due Date</string>
+  
+  <!-- Sort Selection: sort by importance -->
+  <string name="SSD_sort_importance">By Importance</string>
+  
+  <!-- Sort Selection: sort by modified date -->
+  <string name="SSD_sort_modified">By Last Modified</string>
+  
+  <!-- Sort Selection: reverse -->
+  <string name="SSD_sort_reverse">Reverse Sort</string>
+  
+  <!-- Sort Button: sort temporarily -->
+  <string name="SSD_save_temp">Just Once</string>
+  
+  <!-- Sort Button: sort permanently -->
+  <string name="SSD_save_always">Always</string>
+  
   <!-- =============================================== FilterListActivity == -->
 
   <!-- Filter List Activity Title -->    
diff --git a/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java b/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java
new file mode 100644
index 000000000..9e2efa689
--- /dev/null
+++ b/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java
@@ -0,0 +1,34 @@
+package com.todoroo.astrid.activity;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.view.View;
+
+import com.timsu.astrid.R;
+
+public class SortSelectionActivity {
+
+    private SortSelectionActivity() {
+        // use the static method
+    }
+
+    /**
+     * Create the dialog
+     * @param activity
+     * @return
+     */
+    public static AlertDialog createDialog(Activity activity) {
+        View body = activity.getLayoutInflater().inflate(R.layout.sort_selection_dialog, null);
+
+        AlertDialog dialog = new AlertDialog.Builder(activity).
+            setTitle(R.string.SSD_title).
+            setIcon(android.R.drawable.ic_menu_sort_by_size).
+            setView(body).
+            setPositiveButton(R.string.SSD_save_always, null).
+            setNegativeButton(R.string.SSD_save_temp, null).
+            create();
+        dialog.setOwnerActivity(activity);
+        return dialog;
+    }
+
+}
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 8977788ba..2913a9a1e 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -94,23 +94,25 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
 
     public static final int ACTIVITY_EDIT_TASK = 0;
     public static final int ACTIVITY_SETTINGS = 1;
-    public static final int ACTIVITY_ADDONS = 2;
-    public static final int ACTIVITY_MENU_EXTERNAL = 3;
+    public static final int ACTIVITY_SORT = 2;
+    public static final int ACTIVITY_ADDONS = 3;
+    public static final int ACTIVITY_MENU_EXTERNAL = 4;
 
     // --- menu codes
 
     private static final int MENU_ADDONS_ID = Menu.FIRST + 1;
     private static final int MENU_SETTINGS_ID = Menu.FIRST + 2;
-    private static final int MENU_HELP_ID = Menu.FIRST + 3;
-    private static final int MENU_ADDON_INTENT_ID = Menu.FIRST + 4;
+    private static final int MENU_SORT_ID = Menu.FIRST + 3;
+    private static final int MENU_HELP_ID = Menu.FIRST + 4;
+    private static final int MENU_ADDON_INTENT_ID = Menu.FIRST + 5;
 
-    private static final int CONTEXT_MENU_EDIT_TASK_ID = Menu.FIRST + 5;
-    private static final int CONTEXT_MENU_DELETE_TASK_ID = Menu.FIRST + 6;
-    private static final int CONTEXT_MENU_UNDELETE_TASK_ID = Menu.FIRST + 7;
-    private static final int CONTEXT_MENU_ADDON_INTENT_ID = Menu.FIRST + 8;
+    private static final int CONTEXT_MENU_EDIT_TASK_ID = Menu.FIRST + 6;
+    private static final int CONTEXT_MENU_DELETE_TASK_ID = Menu.FIRST + 7;
+    private static final int CONTEXT_MENU_UNDELETE_TASK_ID = Menu.FIRST + 8;
+    private static final int CONTEXT_MENU_ADDON_INTENT_ID = Menu.FIRST + 9;
 
     /** menu code indicating the end of the context menu */
-    private static final int CONTEXT_MENU_DEBUG = Menu.FIRST + 9;
+    private static final int CONTEXT_MENU_DEBUG = Menu.FIRST + 10;
 
     // --- constants
 
@@ -213,6 +215,10 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
                 R.string.TLA_menu_settings);
         item.setIcon(android.R.drawable.ic_menu_preferences);
 
+        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 = menu.add(Menu.NONE, MENU_HELP_ID, Menu.NONE,
                 R.string.TLA_menu_help);
         item.setIcon(android.R.drawable.ic_menu_help);
@@ -717,6 +723,10 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
             intent = new Intent(this, EditPreferences.class);
             startActivityForResult(intent, ACTIVITY_SETTINGS);
             return true;
+        case MENU_SORT_ID:
+            AlertDialog dialog = SortSelectionActivity.createDialog(this);
+            dialog.show();
+            return true;
         case MENU_HELP_ID:
             intent = new Intent(Intent.ACTION_VIEW,
                     Uri.parse("http://weloveastrid.com/help-user-guide-astrid-v3/active-tasks/")); //$NON-NLS-1$
@@ -727,8 +737,8 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
             AndroidUtilities.startExternalIntent(this, intent, ACTIVITY_MENU_EXTERNAL);
             return true;
 
+        // --- context menu items
 
-        // context menu items
         case CONTEXT_MENU_ADDON_INTENT_ID: {
             intent = item.getIntent();
             AndroidUtilities.startExternalIntent(this, intent, ACTIVITY_MENU_EXTERNAL);