diff --git a/po/he.po b/po/he.po
index 873f5a35..72cdebac 100644
--- a/po/he.po
+++ b/po/he.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-14 02:42+0200\n"
-"PO-Revision-Date: 2014-02-14 02:45+0200\n"
+"POT-Creation-Date: 2014-02-15 21:23+0200\n"
+"PO-Revision-Date: 2014-02-15 21:24+0200\n"
 "Last-Translator: Yosef Or Boczko <yoseforb@gnome.org>\n"
 "Language-Team: עברית <>\n"
 "Language: he\n"
@@ -93,11 +93,11 @@ msgstr "שבועיים אחורנית"
 #. IDs are # of days
 #: ../src/client/accounts/add-edit-page.vala:218
 msgid "1 month back"
-msgstr "חודש 1 אחורנית"
+msgstr "חודש אחד אחורנית"
 
 #: ../src/client/accounts/add-edit-page.vala:219
 msgid "3 months back"
-msgstr "3 חודשים אחורנית"
+msgstr "שלושה חודשים אחורנית"
 
 #: ../src/client/accounts/add-edit-page.vala:220
 msgid "6 months back"
@@ -105,54 +105,62 @@ msgstr "שישה חודשים אחורנית"
 
 #: ../src/client/accounts/add-edit-page.vala:221
 msgid "1 year back"
-msgstr "שנה 1 אחורנית"
+msgstr "שנה אחת אחורנית"
+
+#: ../src/client/accounts/add-edit-page.vala:222
+msgid "2 years back"
+msgstr "שנתיים אחורנית"
+
+#: ../src/client/accounts/add-edit-page.vala:223
+msgid "4 years back"
+msgstr "ארבע שנים אחורנית"
 
 #. Separator
-#: ../src/client/accounts/add-edit-page.vala:223
+#: ../src/client/accounts/add-edit-page.vala:225
 msgid "Everything"
 msgstr "הכל"
 
-#: ../src/client/accounts/add-edit-page.vala:599
+#: ../src/client/accounts/add-edit-page.vala:601
 msgid "Remem_ber passwords"
 msgstr "זכירת סס_מאות"
 
-#: ../src/client/accounts/add-edit-page.vala:606 ../ui/login.glade.h:6
+#: ../src/client/accounts/add-edit-page.vala:608 ../ui/login.glade.h:6
 msgid "Remem_ber password"
 msgstr "זכירת _ססמה"
 
-#: ../src/client/accounts/add-edit-page.vala:635
+#: ../src/client/accounts/add-edit-page.vala:637
 msgid "Unable to validate:\n"
 msgstr "לא ניתן לאמת לאמת:\n"
 
-#: ../src/client/accounts/add-edit-page.vala:637
+#: ../src/client/accounts/add-edit-page.vala:639
 msgid "        &#8226; Invalid account nickname.\n"
 msgstr "        &#8226; כינוי חשבון לא חוקי.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:640
+#: ../src/client/accounts/add-edit-page.vala:642
 msgid "        &#8226; Email address already added to Geary.\n"
 msgstr "        &#8226; כתובת דוא״ל זה כבר נוסף ל־Geary.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:644
+#: ../src/client/accounts/add-edit-page.vala:646
 msgid "        &#8226; IMAP connection error.\n"
 msgstr "        &#8226; IMAP בעיית חיבור.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:647
+#: ../src/client/accounts/add-edit-page.vala:649
 msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr "&#8226; שם משתמש או ססמת ה־IMAP שגויים.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:650
+#: ../src/client/accounts/add-edit-page.vala:652
 msgid "        &#8226; SMTP connection error.\n"
 msgstr "        &#8226; SMTP בעיית חיבור.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:653
+#: ../src/client/accounts/add-edit-page.vala:655
 msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr "        &#8226; שם משתמש או ססמת SMTP אינם נכונים.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:657
+#: ../src/client/accounts/add-edit-page.vala:659
 msgid "        &#8226; Connection error.\n"
 msgstr "&#8226; בעיית חיבור.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:661
+#: ../src/client/accounts/add-edit-page.vala:663
 msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; שם משתמש או ססמה אינם נכונים.\n"
 
@@ -551,26 +559,26 @@ msgstr ""
 "\n"
 "יש לבדוק את חיבור הרשת שלך ולהפעיל מחדש את Geary."
 
-#: ../src/client/application/geary-controller.vala:1324
+#: ../src/client/application/geary-controller.vala:1335
 #, c-format
 msgid "About %s"
 msgstr "על אודות %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada.taro@example.com>
-#: ../src/client/application/geary-controller.vala:1327
+#: ../src/client/application/geary-controller.vala:1338
 msgid "translator-credits"
 msgstr ""
 "דוביקס <dovix2003@gmail.com>\n"
 "ירון שהרבני <sh.yaron@gmail.com>\n"
 "יוסף אור בוצ׳קו <yoseforb@gnome.org>"
 
-#: ../src/client/application/geary-controller.vala:1584
+#: ../src/client/application/geary-controller.vala:1595
 #, c-format
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "האם אכן לפתוח את „%s”?"
 
-#: ../src/client/application/geary-controller.vala:1585
+#: ../src/client/application/geary-controller.vala:1596
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -578,33 +586,33 @@ msgstr ""
 "קבצים מצורפים עלולים לגרום נזק למערכת שלך. כדאי לפתוח אך ורק קבצים המגיעים "
 "ממקור אמין."
 
-#: ../src/client/application/geary-controller.vala:1586
+#: ../src/client/application/geary-controller.vala:1597
 msgid "Don't _ask me again"
 msgstr "_לא לשאול אותי שוב"
 
-#: ../src/client/application/geary-controller.vala:1604
+#: ../src/client/application/geary-controller.vala:1615
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "קובץ בשם „%s” כבר קיים. האם להחליף אותו?"
 
-#: ../src/client/application/geary-controller.vala:1606
+#: ../src/client/application/geary-controller.vala:1617
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "הקובץ כבר קיים תחת „%s”. החלפתו תגרום לאיבוד התוכן הקיים."
 
-#: ../src/client/application/geary-controller.vala:1609
+#: ../src/client/application/geary-controller.vala:1620
 msgid "_Replace"
 msgstr "ה_חלפה"
 
-#: ../src/client/application/geary-controller.vala:1911
+#: ../src/client/application/geary-controller.vala:1922
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "האם ברצונך למחוק הודעה זו לצמיתות?"
 msgstr[1] "האם ברצונך למחוק הודעות אלה לצמיתות?"
 msgstr[2] "האם ברצונך למחוק הודעות אלה לצמיתות?"
 
-#: ../src/client/application/geary-controller.vala:1913
+#: ../src/client/application/geary-controller.vala:1924
 msgid "Delete"
 msgstr "מחיקה"
 
@@ -1233,46 +1241,57 @@ msgstr "כלום"
 #. Map of user-supplied search field names to column names.
 #. / Can be typed in the search box like attachment:file.txt to find
 #. / messages with attachments with a particular name.
-#: ../src/engine/imap-db/imap-db-account.vala:639
+#: ../src/engine/imap-db/imap-db-account.vala:662
 msgid "attachment"
 msgstr "מצורף"
 
 #. / Can be typed in the search box like bcc:johndoe@example.com to find
 #. / messages bcc'd to a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:642
+#. Fields we allow the token to be "me" as in from:me.
+#: ../src/engine/imap-db/imap-db-account.vala:665
+#: ../src/engine/imap-db/imap-db-account.vala:684
 msgid "bcc"
 msgstr "מוסתר"
 
 #. / Can be typed in the search box like body:word to find the word only
 #. / if it occurs in the body of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:645
+#: ../src/engine/imap-db/imap-db-account.vala:668
 msgid "body"
 msgstr "גוף"
 
 #. / Can be typed in the search box like cc:johndoe@example.com to find
 #. / messages cc'd to a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:648
+#: ../src/engine/imap-db/imap-db-account.vala:671
+#: ../src/engine/imap-db/imap-db-account.vala:684
 msgid "cc"
 msgstr "עותק"
 
 #. / Can be typed in the search box like from:johndoe@example.com to
 #. / find messages from a particular sender.
-#: ../src/engine/imap-db/imap-db-account.vala:651
+#: ../src/engine/imap-db/imap-db-account.vala:674
+#: ../src/engine/imap-db/imap-db-account.vala:684
 msgid "from"
 msgstr "מאת"
 
 #. / Can be typed in the search box like subject:word to find the word
 #. / only if it occurs in the subject of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:654
+#: ../src/engine/imap-db/imap-db-account.vala:677
 msgid "subject"
 msgstr "נושא"
 
 #. / Can be typed in the search box like to:johndoe@example.com to find
 #. / messages received by a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:657
+#: ../src/engine/imap-db/imap-db-account.vala:680
+#: ../src/engine/imap-db/imap-db-account.vala:684
 msgid "to"
 msgstr "אל"
 
+#. "me" can be typed like from:me or cc:me, etc. as a shorthand
+#. to find mail to or from yourself in search.
+#: ../src/engine/imap-db/imap-db-account.vala:699
+msgid "me"
+msgstr "אני"
+
 #. List of folder names to match for Drafts, separated by |.  Please add localized common
 #. names for the Drafts folder, leaving in the English names as well.  The first in the list
 #. will be the default, so please add the most common localized name to the front.