diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
new file mode 100644
index 000000000..592cc4dcc
--- /dev/null
+++ b/res/values-ja/arrays.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+     
+     - translate to Japanese by Maimuzo (maimuzo@gmail.com)
+-->
+
+<resources>
+    <!-- Make these < 20 chars so the task name is displayed -->
+    <string-array name="reminders">
+        <item>やぁみんな! ちょっといいかな?</item>
+        <item>ちょっと見ていい?</item>
+        <item>ちょっと時間あるかな?</item>
+        <item>忘れちゃった?</item>
+        <item>ごめんよ!</item>
+        <item>ちょっと時間があるとき:</item>
+        <item>予定上:</item>
+        <item>ちょっとヒマある?</item>
+        <item>Astridだよ!</item>
+        <item>やぁ! ちょっといいかな?</item>
+        <item>ちょっと時間ある?</item>
+        <item>ごきげんよう</item>
+    </string-array>
+    
+    <!-- Astrid says...  (user should answer yes or no)-->
+    <string-array name="reminder_responses">
+        <item>私は、あなたのために何かを持っています！</item>
+        <item>過去にこれを設定していいの？</item>
+        <item>なんでコレしないの?</item>
+        <item>それどう? イケてる?</item>
+        <item>準備できてる?</item>
+        <item>これ管理できる?</item>
+        <item>幸せになれるよ! これを終わらすだけで!</item>
+        <item>これを終えたらあなたの気分が良くなることを約束します!</item>
+        <item>今日はコレしないの?</item>
+        <item>これを終えてください、私はそれにうんざりしています！</item>
+        <item>それやっちゃえる? もちろんできるさ!</item>
+        <item>あなたはこうするつもりですか？</item>
+        <item>調子良さそうじゃん! さぁやろっか!</item>
+        <item>やるじゃん! それもやっちゃえ!</item>
+        <item>これ終わらせておやつにしない?</item>
+        <item>このタスクだけ? やっちゃお?</item>
+        <item>ToDoリストを消化する時間だよ!</item>
+    </string-array>
+    
+    <string-array name="notif_icon_entries">
+        <item>ピンク</item>
+        <item>ボーリング</item>
+        <item>Astrid</item>
+    </string-array>
+       
+</resources>
diff --git a/res/values-nn/arrays.xml b/res/values-nn/arrays.xml
new file mode 100644
index 000000000..e6c29ca71
--- /dev/null
+++ b/res/values-nn/arrays.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Make these < 20 chars so the task name is displayed -->
+    <string-array name="reminders">
+        <item>Hei! har du et øyeblikk?</item>
+        <item>Kan jeg forstyrre deg noen sekunder?</item>
+        <item>Har du litt tid?</item>
+        <item>Glemte du?</item>
+        <item>Unnskyld meg!</item>
+        <item>Når du har tid:</item>
+        <item>På agendaen:</item>
+        <item>Ledig et øyeblikk?</item>
+        <item>Astrid her!</item>
+        <item>Hei! Kan jeg plage deg litt?</item>
+        <item>Et minutt av din tid?</item>
+        <item>Det er en flott dag for å</item>
+    </string-array>
+    
+    <!-- Astrid says...  (user should answer yes or no)-->
+    <string-array name="reminder_responses">
+        <item>Jeg har noe til deg!</item>
+        <item>Klar for å legge dette til fortiden?</item>
+        <item>Hvorfor gjør du ikke dette?</item>
+        <item>Så, er du klar?</item>
+        <item>Klar for å gjøre dette?</item>
+        <item>Takler du dette?</item>
+        <item>Du kan bli lykkelig! Bare gjør ferdig dette!</item>
+        <item>Jeg lover at du vil føle deg bedre om du fullfører dette!</item>
+        <item>Hvorfor ikke gjøre dette i dag?</item>
+        <item>Vær så snill å fullfør oppgaven, jeg er lei den!</item>
+        <item>Kan du noensinne fullføre dette? Ja, det kan du!</item>
+        <item>Kommer du noensinne til å fullføre dette?</item>
+        <item>Føl deg bra. Kom igjen!</item>
+        <item>Jeg er stolt av deg! La oss få det gjort!</item>
+        <item>Litt snop etter at du har fullført dette?</item>
+        <item>Bare denne ene oppgaven. Vær så snill?</item>
+        <item>På tide å korte ned gjøremålslisten!</item>
+    </string-array>
+    
+    <!-- Astrid's nagging when user clicks postpone -->
+    <string-array name="postpone_nags">
+        <item>Ikke fortell meg at det ikke er sant at du er en prokrastinerer!</item>
+        <item>Blir det ikke kjedelig å være lat?</item>
+        <item>Et eller annet sted er noen avhengig av at du fullfører dette!</item>
+        <item>Når du sier slumre mener du egentlig "Jeg gjør dette!", ikke sant?</item>
+        <item>Dette er siste gang du utsetter dette, ikke sant?</item>
+        <item>Bare fullfør dette i dag, jeg lover å ikke si det til noen!</item>
+        <item>Hvorfor utsette noe du kan.. velge å ikke utsette!</item>
+        <item>Du kommer til å fullføre dette etterhvert, antar jeg?</item>
+        <item>Jeg synes du er kjempebra! Hva med å ikke utsette dette?</item>
+        <item>Oppnår du målene dine om du gjør det?</item>
+        <item>Utsett, utsett, utsett. Når skal du forbedre deg?</item>
+        <item>Jeg har fått nok av unnskyldningene dine! Bare gjør det!</item>
+        <item>Brukte du ikke den unnskyldningen sist?</item>
+        <item>Jeg kan ikke hjelpe deg med å organisere livet ditt hvis du holder på sånn...</item>
+    </string-array>
+    
+    <!-- Icons for notification tray -->
+    <string-array name="notif_icon_entries">
+        <item>Rosa</item>
+        <item>Kjedelig</item>
+        <item>Astrid</item>
+    </string-array>
+    
+</resources>
diff --git a/res/values-nn/strings.xml b/res/values-nn/strings.xml
index 17ca36413..aa117838c 100644
--- a/res/values-nn/strings.xml
+++ b/res/values-nn/strings.xml
@@ -228,7 +228,8 @@ Hvis du ikke ønsker å se den nye oppgaven rett etter at du fullfører den gaml
   <!--Original value: Save-->
   <string name="taskEdit_menu_save">Lagre</string>
   <!--Original value: Task Saved: due in %s-->
-  <string name="taskEdit_onTaskSave_Due">Oppgave lagret: utløper om %s</string>
+  <string name="taskEdit_onTaskSave_Due">Oppgave lagret: utløper om %s</string>
+  <string name="taskEdit_onTaskSave_Overdue">Oppgave lagret: utløp for %s siden</string>
   <!--Original value: Task Saved-->
   <string name="taskEdit_onTaskSave_notDue">Oppgave lagret</string>
   
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
deleted file mode 100644
index ff5300de5..000000000
--- a/res/values-zh/strings.xml
+++ /dev/null
@@ -1,415 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ASTRID: Android's Simple Task Recording Dashboard
- 
-  Copyright (c) 2009 Tim Su
- 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
- 
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-  for more details.
- 
-  You should have received a copy of the GNU General Public License along
-  with this program; if not, write to the Free Software Foundation, Inc.,
-  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- 
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- application -->
-    <string name="app_name">Astrid</string>
-    
-    <!-- General String Constants -->
-    <skip />
-    
-        <!-- Importance Labels -->
-        <string name="importance_1">!!!!</string>
-        <string name="importance_2">!!!</string>
-        <string name="importance_3">!!</string>
-        <string name="importance_4">!</string>
-        
-        <!-- Repeat Interval Labels -->
-        <string name="repeat_days">天</string>
-        <string name="repeat_weeks">星期</string>
-        <string name="repeat_months">月</string>
-        <string name="repeat_hours">小时</string>
-        
-        <!-- Plurals -->
-        <plurals name="Ntasks">
-            <item quantity="one">一个任务</item>
-            <item quantity="two">两个任务</item>
-            <item quantity="other">%d个任务</item>
-        </plurals>
-        <plurals name="NactiveTasks">
-            <item quantity="one">%d / %d 需要作</item>
-            <item quantity="other">%d / %d 需要作</item>
-        </plurals>
-        <plurals name="Nalarms">
-            <item quantity="one">一个闹钟</item>
-            <item quantity="two">两个闹钟</item>
-            <item quantity="other">%d个闹钟</item>
-        </plurals>
-        <plurals name="Ntags">
-            <item quantity="one">一个标签</item>
-            <item quantity="two">两个标签</item>
-            <item quantity="other">%d个标签</item>
-        </plurals>
-        
-        <!-- Time Constants -->
-        <string name="dateFormatter">MMM d</string> <!-- used for long due 
-            dates. c.f. Java's SimpleDateFormat -->
-        <string name="daysVertical">天</string> <!-- vertical labels
-            are used in the number dialogs -->
-        <string name="hoursVertical">小\n时</string>
-        <plurals name="Ndays">
-            <item quantity="one">一天</item>
-            <item quantity="other">%d天</item>
-        </plurals>
-        <plurals name="Nhours">
-            <item quantity="one">一小时</item>
-            <item quantity="other">%d小时</item>
-        </plurals>
-        <plurals name="Nminutes">
-            <item quantity="one">一分钟</item>
-            <item quantity="other">%d分钟</item>
-        </plurals>
-        <plurals name="Nseconds">
-            <item quantity="one">一秒钟</item>
-            <item quantity="other">%d秒钟</item>
-        </plurals>
-        <plurals name="NhoursShort">
-            <item quantity="one">一小时</item>
-            <item quantity="other">%d小时</item>
-        </plurals>
-        <plurals name="NminutesShort">
-            <item quantity="one">一分钟</item>
-            <item quantity="other">%d分钟</item>
-        </plurals>
-        <plurals name="NsecondsShort">
-            <item quantity="one">一秒钟</item>
-            <item quantity="other">%d秒钟</item>
-        </plurals>
-        <string name="ago_suffix">以前</string><!-- appended after time
-            constants to show time in past -->
-        
-    <!-- TaskList -->
-    <skip />
-        <!-- title bar -->
-        <string name="taskList_titlePrefix">Astrid: </string>
-        <string name="taskList_titleTagPrefix">\"%s\"标签: </string>
-        <string name="taskList_hiddenSuffix">藏</string>
-        <string name="addtask_label">新任务</string>
-        <string name="missing_tag">没有这个标签!</string>
-        
-        <!-- text in the actual list -->
-        <string name="taskList_hiddenPrefix">藏</string><!-- prefix to show that a task is hidden -->
-        <string name="taskList_dueRelativeTime">到期还有</string><!-- i.e. Due in 4 days -->
-        <string name="taskList_dueAbsoluteDate">到期在</string><!-- i.e. Due on Jan 2 -->
-        <string name="taskList_goalPrefix">希望</string><!-- prefix to deadline -->
-        <string name="taskList_overdueBy">过期</string>
-        <string name="taskList_completedPrefix">完成了</string><!-- i.e. Finished 4 days ago -->
-		<string name="taskList_estimatedTimePrefix">估计:</string><!-- i.e.  Estimated 4: hours -->
-        <string name="taskList_elapsedTimePrefix">花了:</string><!-- i.e. Spent  88 minutes on tax. -->
-        <string name="taskList_periodicReminderPrefix">Poke Every</string><!-- time interval to set frequency to remind user -->
-        <string name="taskList_repeatPrefix">Repeats Every</string><!-- time interval to set repeated tasks-->
-        <string name="taskList_alarmPrefix">Next Alarm:</string>
-        <string name="taskList_tagsPrefix">标签:</string>
-        <string name="taskList_notesPrefix">笔记:</string>
-        <string name="taskList_createdPrefix">造时:</string><!-- Created: MM/DD/YY -->
-        <string name="taskList_deleted">删时：</string><!-- Deleted: MM/DD/YY -->
-        
-        <!-- menu items -->
-        <string name="taskList_menu_insert">加</string><!-- Add or Insert -->
-        <string name="taskList_menu_tags">标签</string>
-        <string name="taskList_menu_filters">Display</string>
-        <string name="taskList_menu_syncshortcut">同步</string>
-        <string name="taskList_menu_more">。。。</string>
-        <string name="taskList_menu_sync">同步</string>
-        <string name="taskList_menu_settings">设定</string>
-        <string name="taskList_menu_help">帮助</string>
-        <string name="taskList_menu_tips">忠告</string>
-        <string name="taskList_menu_cleanup">打扫老任务</string>
-        
-        <string name="taskList_context_edit">编辑</string>
-        <string name="taskList_context_delete">删除</string>
-        <string name="taskList_context_startTimer">计时</string>
-        <string name="taskList_context_stopTimer">停计时</string>
-        <string name="taskList_context_postpone">延期</string>
-        
-        <!-- filter menu -->
-        <string name="taskList_filter_title">分类</string>
-        <string name="taskList_filter_hidden">Hidden/Blocked Tasks</string>
-        <string name="taskList_filter_done">Completed Tasks</string>
-        <string name="taskList_filter_tagged">Tagged \'%s\'</string>
-        <string name="taskList_sort_auto">Auto Sort</string>
-        <string name="taskList_sort_alpha">Sort By Name</string>
-        <string name="taskList_sort_duedate">Sort By Due Date</string>
-        <string name="taskList_sort_reverse">Sort Reverse</string>
-        
-        <string name="taskList_nonag_reminder">Select an Action:</string>
-        <string name="taskList_postpone_count">延期了%d次</string>
-        <string name="taskList_postpone_dialog">延期多少时间？</string>
-        <string name="taskList_cleanup_dialog">"Delete completed tasks older than # days:"</string>
-
-    <!-- TaskEdit -->
-    <skip />
-        <!-- title bar -->
-        <string name="taskEdit_titleGeneric">Astrid: 编辑任务</string>
-        <string name="taskEdit_titlePrefix">Astrid: 编辑</string>
-        <string name="taskEdit_label">Astrid: 新任务</string>
-        
-        <!-- tabs -->
-        <string name="taskEdit_tab_basic">细目</string>
-        <string name="taskEdit_tab_dates">时</string>
-        <string name="taskEdit_tab_alerts">闹钟</string>
-        
-        <!-- labels -->
-        <string name="name_label">总结</string>
-        <string name="name_hint">任务总结</string>
-        <string name="importance_label">多少要紧</string>
-        <string name="tags_label">标签:</string>
-        
-        <string name="estimatedDuration_label">需要多少时间?</string>
-        <string name="elapsedDuration_label">已经花了多少时间？</string>
-        <string name="definiteDueDate_label">Absolute Deadline</string>
-        <string name="preferredDueDate_label">Goal Deadline</string>
-        <string name="addToCalendar_label">Add Task To Calendar</string>
-        <string name="showCalendar_label">Open Calendar Event</string>
-        <string name="hiddenUntil_label">Hide Until This Date</string>
-        <string name="repeat_label">Repeat Every</string>
-        <string name="repeat_value_unset">No Repeat Set</string>
-        <string name="blockingOn_label">Hide Until This Task is Done</string>
-        <string name="notes_label">Notes</string>
-        <string name="notes_hint">Enter Task Notes</string>
-        
-        <string name="notification_label">Periodic Reminders</string>
-        <string name="notification_prefix">Every</string>
-        <string name="flags_label">Notify me...</string>
-        <string name="flag_before">As Deadlines Approach</string>
-        <string name="flag_during">At Deadlines</string>
-        <string name="flag_after">After Absolute Deadline Passes</string>
-        <string name="flag_nonstop">Nonstop Until I View the Task</string>
-        <string name="alerts_label">Fixed Reminders</string>
-        <string name="add_alert">Add New Reminder</string>
-        
-        <!-- dialog boxes -->
-        <string name="hour_minutes_dialog">Time (hours : minutes)</string>
-        <string name="notification_dialog">Remind Me Every</string>
-        <string name="repeat_picker_title">Repeat Every (0 to disable)</string>
-        <string name="repeat_help_dialog_title">Help: Astrid Repeats</string>
-        <string name="repeat_help_dialog">
-To use repeats, set at least one of the deadlines above. When you complete this task, the deadline will be automatically advanced.
-\n\n
-If you don\'t want to see the new task right after you complete the old one, you should use the "Hide Until" field, which will also be advanced automatically.
-\n
-        </string>
-        <string name="repeat_help_hide">Don't Show Help Anymore</string>
-        
-        <!-- buttons -->
-        <string name="save_label">Save</string>
-        <string name="discard_label">Discard</string>
-        <string name="edit_label">Edit</string>
-        <string name="delete_label">Delete</string>
-        <string name="blank_button_title">Click to Set</string>
-        <string name="startTimer_label">Start Timer</string>
-        <string name="stopTimer_label">Stop Timer</string>
-        
-        <string name="taskEdit_menu_save">Save</string>
-        <string name="taskEdit_onTaskSave_Due">Task Saved: due in %s</string>
-        <string name="taskEdit_onTaskSave_notDue">Task Saved</string>
-      
-    <!-- TaskView  -->
-    <skip />
-    
-        <string name="taskView_notifyTitle">Astrid says...</string>
-        
-    <!-- Tag List -->
-    <skip />
-        <string name="tagList_titlePrefix">Astrid: Tag View: </string>
-        <string name="tagList_context_create">Create Task With Tag</string>
-        <string name="tagList_context_edit">Edit Tag</string>
-        <string name="tagList_context_delete">Delete Tag</string>
-        <string name="tagList_context_showTag">Show on Home Page</string>
-        <string name="tagList_context_hideTag">Hide on Home Page</string>
-        <string name="tagList_context_shortcut">Create Shortcut</string>
-        <string name="tagList_shortcut_created">Shortcut created on your home screen!</string>
-        <string name="tagList_shortcut_prefix">Tag:</string>
-        <string name="tagList_untagged">-- Not tagged --</string>
-        
-        <string name="tagList_menu_sortAlpha">Sort A-Z</string>
-        <string name="tagList_menu_sortSize">Sort by Size</string>
-    
-    
-    <!-- Synchronization -->  
-    <skip />
-        <string name="sync_pref_group">Synchronization Services</string>
-        <string name="sync_pref_group_actions">Actions</string>
-        <string name="sync_pref_group_options">Options</string>
-        <string name="p_sync_rtm">sync_rtm</string>
-        <string name="sync_rtm_title">Remember The Milk</string><!-- Proper noun - don't translate ? -->
-        <string name="sync_rtm_desc">http://www.rememberthemilk.com</string>
-        <string name="p_sync_every">sync_every</string>
-        <string name="sync_every_title">Synchronize Frequency</string>
-        <string name="sync_every_desc">If set, perform sync every # hours</string>
-        <string name="p_sync_button">sync_button</string>
-        <string name="sync_button_title">Main Menu Shortcut</string>
-        <string name="sync_button_desc">Show \"Synchronize\" in Astrid\'s menu</string>
-        <string name="p_sync_quiet">sync_dialogs</string>
-        <string name="sync_quiet_title">Hide Dialogs</string>
-        <string name="sync_quiet_desc">Hide the Sync Results dialogs</string>
-        <string name="p_sync_background">sync_background</string>
-        <string name="sync_background_title">In Background</string>
-        <string name="sync_background_desc">Synchronize without bothering you</string>
-        <string name="sync_error">Sync Error! Sorry for the inconvenience! Error:</string>
-        <string name="sync_auth_request">
-In order to synchronize, please log in to your %s account and authorize Astrid to read your data.
-\n\n
-When finished, restart Astrid and come back here.
-        </string>
-        <string name="sync_rtm_notes">
-Welcome to Astrid\'s RTM sync!
-\n\n
-Things that don\'t sync:\n
-- Notifications and repeats\n
-- In RTM, deleting, or moving+renaming tasks\n
-\n
-Wish me luck!\n
-        </string>
-        <string name="sync_now">Synchronize Now!</string>
-        <string name="sync_forget">Clear Personal Data</string>
-        <string name="sync_forget_confirm">Clear data for selected services?</string>
-        <string name="sync_no_synchronizers">No Synchronizers Enabled!</string>
-       
-    <!-- Dialog Boxes -->  
-    <skip />
-        <string name="loading">Loading...</string>
-        <string name="updating">Updating List...</string>
-        <string name="information_title">Information</string>
-        <string name="question_title">Question</string>
-        <string name="notify_yes">View Task</string>
-        <string name="notify_done">Already Done!</string>
-        <string name="notify_snooze">Snooze</string>
-        <string name="notify_no">Quit</string>
-        <string name="notify_snooze_title">Hours/minutes to snooze?</string>
-        
-        <string name="delete_title">Delete</string>        
-        <string name="delete_this_task_title">Delete this task?</string>
-        <string name="delete_this_tag_title">Remove this tag from all tasks?</string>
-        
-        <string name="stop_timer_title">Stop the timer?</string>
-        
-        <string name="quick_tips">
-Some things you may not know about Astrid:\n
-\n
-- To create a task, just start typing!\n
-- While editing a task, hit \'back\' to save it\n
-- Select a task &amp; press 1-4 to quickly change it\'s priority\n
-- If a task has a deadline, long-press to postpone it\n
-\n
-Thanks for using Astrid!\n
-        </string>
-
-     
-    <!-- Notification -->  
-    <skip />
-        
-        <string name="notif_definiteDueDate">Absolute Deadline!</string>
-        <string name="notif_preferredDueDate">Goal Deadline!</string>
-        <string name="notif_timerStarted">Working on:</string>
-        
-    <!-- Error Messages -->  
-    <skip />
-    
-        <string name="error_opening">Couldn't find this item:</string>
-        <string name="error_saving">Couldn't save:</string>
-    
-    <!-- Preference Keys. Strings starting with p_* should not be localized -->  
-    <skip />
-
-        <string name="prefs_category_alerts">Notifications</string>
-        
-        <string name="p_notif_quietStart">notif_qstart</string>
-        <string name="prefs_quietStart_title">Quiet Hours Start</string>
-        <string name="prefs_quietStart_desc">Starting hour when Astrid should be quiet (e.g. 22)</string>
-        
-        <string name="p_notif_quietEnd">notif_qend</string>
-        <string name="prefs_quietEnd_title">Quiet Hours End</string>
-        <string name="prefs_quietEnd_desc">Ending hour when Astrid should be quiet (e.g. 08)</string>
-          
-        <string name="p_notif_defaultRemind">notif_default_reminder</string>
-        <string name="prefs_defaultRemind_title">Default Reminders</string>
-        <string name="prefs_defaultRemind_desc">For new tasks, in days (i.e. 7). Blank to disable</string>
-        
-        <string name="p_notif_annoy">notif_annoy</string>
-        <string name="prefs_annoy_title">Persistent Mode</string>
-        <string name="prefs_annoy_desc">If checked, you must view reminders before clearing them (also LED)</string>
-        
-        <string name="p_notification_ringtone">notification_ringtone</string>
-        <string name="prefs_notification_title">Notification Ringtone</string>
-        <string name="prefs_notification_desc">Choose a ringtone for Astrid\'s alerts</string>
-
-        <string name="p_notif_icon">notif_theme</string>
-        <string name="prefs_notificon_title">Notification Icons</string>
-        <string name="prefs_notificon_desc">Choose Astrid\'s notification bar icon</string>
-        
-        <string name="prefs_category_appearance">Appearance</string>
-            
-        <string name="p_colorize">colorize</string>
-        <string name="prefs_colorize_title">Colorize Task List</string>
-        <string name="prefs_colorize_desc">Different colors for different priorities</string>
-        
-        <string name="p_fontSize">font_size</string>
-        <string name="prefs_fontSize_title">Task List Font</string>
-        <string name="prefs_fontSize_desc">Font on the main listing page (i.e. 22)</string>
-
-        <string name="prefs_category_other">Other</string>
-        
-        <string name="p_nagging">nagging</string>
-        <string name="prefs_nagging_title">Nag Messages</string>
-        <string name="prefs_nagging_desc">Show Astrid\'s comments when viewing reminders and postponing tasks?</string>
-
-        <string name="p_deadlineTime">deadline_time</string>
-        <string name="prefs_deadlineTime_title">Default Deadlines</string>
-        <string name="prefs_deadlineTime_desc"># of days from now to set new deadlines</string>
-        
-        <string name="displayedFields_PrefScreen_Title">Displayed Fields</string>
-        <string name="displayedFields_PrefScreen_Desc">Select the fields to show in task list</string>
-        
-        <!-- notification keys (no title, desc, default suffix) should not be localized -->
-        <string name="prefs_titleVisible">titleVisible</string> 
-        <string name="prefs_titleVisible_title">Task Title</string>
-        <string name="prefs_titleVisible_desc">Task description</string>
-        <string name="prefs_titleVisible_default">true</string>
-	    <string name="prefs_deadlineVisible">deadlineVisible</string>
-        <string name="prefs_deadlineVisible_title">Dates</string>
-        <string name="prefs_deadlineVisible_desc">Upcoming deadlines / completed date</string>
-        <string name="prefs_deadlineVisible_default">true</string>
-    	<string name="prefs_timeVisible">timeVisible</string>
-        <string name="prefs_timeVisible_title">Times</string>
-        <string name="prefs_timeVisible_desc">Estimated &amp; Elapsed Times</string>
-        <string name="prefs_timeVisible_default">true</string>
-        <string name="prefs_importanceVisible">importanceVisible</string>
-        <string name="prefs_importanceVisible_title">Importance</string>
-        <string name="prefs_importanceVisible_desc">Task importance indicator</string>
-        <string name="prefs_importanceVisible_default">true</string>
-	    <string name="prefs_tagsVisible">tagsVisible</string>
-        <string name="prefs_tagsVisible_title">Tags</string>
-        <string name="prefs_tagsVisible_desc">Tags associated with this task</string>
-        <string name="prefs_tagsVisible_default">true</string>
-	    <string name="prefs_repeatVisible">repeatVisible</string>
-        <string name="prefs_repeatVisible_title">Repeats</string>
-        <string name="prefs_repeatVisible_desc">Task repeat information</string>
-        <string name="prefs_repeatVisible_default">true</string>
-	    <string name="prefs_reminderVisible">reminderVisible</string>
-        <string name="prefs_reminderVisible_title">Reminders</string>
-        <string name="prefs_reminderVisible_desc">Displayed if this task has reminders</string>
-        <string name="prefs_reminderVisible_default">false</string>
-	    <string name="prefs_notesVisible">notesVisible</string>
-        <string name="prefs_notesVisible_title">Notes</string>
-        <string name="prefs_notesVisible_desc">Notes associated with this task</string>
-        <string name="prefs_notesVisible_default">false</string>
-</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c21a67435..1b78826da 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -225,6 +225,7 @@ If you don\'t want to see the new task right after you complete the old one, you
         
         <string name="taskEdit_menu_save">Save</string>
         <string name="taskEdit_onTaskSave_Due">Task Saved: due in %s</string>
+        <string name="taskEdit_onTaskSave_Overdue">Task Saved: due %s ago</string>
         <string name="taskEdit_onTaskSave_notDue">Task Saved</string>
       
     <!-- TaskView  -->
diff --git a/src/com/timsu/astrid/activities/TaskEdit.java b/src/com/timsu/astrid/activities/TaskEdit.java
index a65f37da2..25f15220f 100644
--- a/src/com/timsu/astrid/activities/TaskEdit.java
+++ b/src/com/timsu/astrid/activities/TaskEdit.java
@@ -308,10 +308,19 @@ public class TaskEdit extends TaskModificationTabbedActivity<TaskModelForEdit> {
      * @param dueDate the Date when the task is due
      */
     private void showSaveToast(Date dueDate) {
+    	int stringResource;
+
     	int timeInSeconds = (int)((dueDate.getTime() - System.currentTimeMillis())/1000L);
+
+    	if (timeInSeconds < 0) {
+    		timeInSeconds *= -1; // DateUtilities.getDurationString() requires positive integer
+    		stringResource = R.string.taskEdit_onTaskSave_Overdue;
+    	} else {
+    		stringResource = R.string.taskEdit_onTaskSave_Due;
+    	}
     	String formattedDate = DateUtilities.getDurationString(getResources(), timeInSeconds, 2);
     	Toast.makeText(this,
-    			getResources().getString(R.string.taskEdit_onTaskSave_Due, formattedDate),
+    			getResources().getString(stringResource, formattedDate),
     			Toast.LENGTH_SHORT).show();
     }
 
diff --git a/src/com/timsu/astrid/sync/RTMSyncProvider.java b/src/com/timsu/astrid/sync/RTMSyncProvider.java
index 034803e8c..c20b5a67e 100644
--- a/src/com/timsu/astrid/sync/RTMSyncProvider.java
+++ b/src/com/timsu/astrid/sync/RTMSyncProvider.java
@@ -393,6 +393,7 @@ public class RTMSyncProvider extends SynchronizationProvider {
         // notes
         StringBuilder sb = new StringBuilder();
         for(RtmTaskNote note: rtmTaskSeries.getNotes().getNotes()) {
+        	sb.append(note.getTitle() + "\n");
             sb.append(note.getText() + "\n");
         }
         if(sb.length() > 0)