diff --git a/po/el.po b/po/el.po
index 6c722d2d..41da7ad1 100644
--- a/po/el.po
+++ b/po/el.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-06-07 05:02+0000\n"
-"PO-Revision-Date: 2014-06-13 14:45+0200\n"
+"POT-Creation-Date: 2014-11-11 23:29+0000\n"
+"PO-Revision-Date: 2014-11-17 12:04+0200\n"
 "Last-Translator: Tom Tryfonidis <tomtryf@gmail.com>\n"
 "Language-Team: www.gnome.gr\n"
 "Language: el\n"
@@ -21,27 +21,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.6.4\n"
+"X-Generator: Poedit 1.6.10\n"
 "X-Project-Style: gnome\n"
 
-#: ../desktop/geary.desktop.in.h:1
+#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
 msgid "Geary"
 msgstr "Geary"
 
-#: ../desktop/geary.desktop.in.h:2
+#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
 #: ../src/client/application/geary-application.vala:18
 msgid "Mail Client"
 msgstr "Πελάτης αλληλογραφίας"
 
-#: ../desktop/geary.desktop.in.h:3
+#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
 msgid "Geary Mail"
 msgstr "Αλληλογραφία Geary"
 
-#: ../desktop/geary.desktop.in.h:4
+#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
 msgid "Send and receive email"
 msgstr "Αποστολή και λήψη ηλεκτρονικού ταχυδρομείου"
 
-#: ../desktop/geary.desktop.in.h:5
+#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
 msgid "Email;E-mail;Mail;"
 msgstr "μήνυμα;ηλεκτρονικό ταχυδρομείο;αλληλογραφία;Email;E-mail;Mail;"
 
@@ -49,6 +49,14 @@ msgstr "μήνυμα;ηλεκτρονικό ταχυδρομείο;αλληλο
 msgid "Compose Message"
 msgstr "Σύνθεση μηνύματος"
 
+#: ../desktop/geary-attach.contract.in.h:1
+msgid "Send by email"
+msgstr "Αποστολή μέσω ηλεκτρονικού ταχυδρομείου"
+
+#: ../desktop/geary-attach.contract.in.h:2
+msgid "Send files using Geary"
+msgstr "Αποστολή αρχείων χρησιμοποιώντας το Geary"
+
 #: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
 #: ../src/client/components/stock.vala:31
 msgid "_Save"
@@ -117,49 +125,49 @@ msgstr "πριν 4 χρόνια"
 msgid "Everything"
 msgstr "Όλα"
 
-#: ../src/client/accounts/add-edit-page.vala:687
+#: ../src/client/accounts/add-edit-page.vala:686
 msgid "Remem_ber passwords"
 msgstr "Απο_μνημόνευση κωδικών πρόσβασης"
 
-#: ../src/client/accounts/add-edit-page.vala:694 ../ui/login.glade.h:6
+#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
 msgid "Remem_ber password"
 msgstr "Απο_μνημόνευση κωδικού πρόσβασης"
 
-#: ../src/client/accounts/add-edit-page.vala:728
+#: ../src/client/accounts/add-edit-page.vala:727
 msgid "Unable to validate:\n"
 msgstr "Δεν ήταν δυνατή η επικύρωση:\n"
 
-#: ../src/client/accounts/add-edit-page.vala:730
+#: ../src/client/accounts/add-edit-page.vala:729
 msgid "        &#8226; Invalid account nickname.\n"
 msgstr "        &#8226; Μη έγκυρο ψευδώνυμο λογαριασμού.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:733
+#: ../src/client/accounts/add-edit-page.vala:732
 msgid "        &#8226; Email address already added to Geary.\n"
 msgstr ""
 "        &#8226; Η διεύθυνση ηλεκτρονικού ταχυδρομείου είναι ήδη καταχωρημένη "
 "στο Geary.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:737
+#: ../src/client/accounts/add-edit-page.vala:736
 msgid "        &#8226; IMAP connection error.\n"
 msgstr "        &#8226; Σφάλμα σύνδεσης IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:740
+#: ../src/client/accounts/add-edit-page.vala:739
 msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr "        &#8226; Λάθος όνομα χρήστη ή κωδικός πρόσβασης IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:743
+#: ../src/client/accounts/add-edit-page.vala:742
 msgid "        &#8226; SMTP connection error.\n"
 msgstr "        &#8226; Σφάλμα σύνδεσης SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:746
+#: ../src/client/accounts/add-edit-page.vala:745
 msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr "        &#8226; Λάθος όνομα χρήστη ή κωδικός πρόσβασης για το SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:750
+#: ../src/client/accounts/add-edit-page.vala:749
 msgid "        &#8226; Connection error.\n"
 msgstr "        &#8226; Σφάλμα σύνδεσης.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:754
+#: ../src/client/accounts/add-edit-page.vala:753
 msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Λάθος όνομα χρήστη ή κωδικός πρόσβασης.\n"
 
@@ -169,247 +177,259 @@ msgstr "Πνευματική ιδιοκτησία 2011-2014 Ίδρυμα Yorba"
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
-msgstr "Επισκεφθείτε την ιστοσελίδα Yorba"
+msgstr "Επισκεφθείτε την ιστοσελίδα του Yorba"
 
 #: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Εκκίνηση του Geary με κρυφό κύριο παράθυρο"
+
+#: ../src/client/application/geary-args.vala:11
 msgid "Output debugging information"
 msgstr "Εμφάνιση πληροφοριών αποσφαλμάτωσης"
 
-#: ../src/client/application/geary-args.vala:11
+#: ../src/client/application/geary-args.vala:12
 msgid "Log conversation monitoring"
 msgstr "Καταγραφή παρακολούθησης της συνομιλίας"
 
-#: ../src/client/application/geary-args.vala:12
+#: ../src/client/application/geary-args.vala:13
 msgid "Log network deserialization"
 msgstr "Καταγραφή δραματοποίησης δικτύου"
 
-#: ../src/client/application/geary-args.vala:13
+#: ../src/client/application/geary-args.vala:14
 msgid "Log network activity"
 msgstr "Καταγραφή δραστηριότητας του δικτύου"
 
 #. / The IMAP replay queue is how changes on the server are replicated on the client.
 #. / It could also be called the IMAP events queue.
-#: ../src/client/application/geary-args.vala:16
+#: ../src/client/application/geary-args.vala:17
 msgid "Log IMAP replay queue"
 msgstr "Καταγραφή ουράς επανάληψης IMAP"
 
 #. / Serialization is how commands and responses are converted into a stream of bytes for
 #. / network transmission
-#: ../src/client/application/geary-args.vala:19
+#: ../src/client/application/geary-args.vala:20
 msgid "Log network serialization"
 msgstr "Καταγραφή δραματοποίησης δικτύου"
 
-#: ../src/client/application/geary-args.vala:20
+#: ../src/client/application/geary-args.vala:21
 msgid "Log periodic activity"
 msgstr "Καταγραφή περιοδικής δραστηριότητας"
 
-#: ../src/client/application/geary-args.vala:21
+#: ../src/client/application/geary-args.vala:22
 msgid "Log database queries (generates lots of messages)"
 msgstr "Καταγραφή ερωτημάτων βάσης δεδομένων (παράγει πολλά μηνύματα)"
 
 #. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:23
+#: ../src/client/application/geary-args.vala:24
 msgid "Log folder normalization"
 msgstr "Καταγραφή ομαλοποίησης φάκελου"
 
-#: ../src/client/application/geary-args.vala:24
+#: ../src/client/application/geary-args.vala:25
 msgid "Allow inspection of WebView"
 msgstr "Να επιτρέπεται η επιθεώρηση του WebView"
 
-#: ../src/client/application/geary-args.vala:25
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Ανάκληση όλων των πιστοποιητικών διακομιστή με προειδοποιήσεις TLS"
+
+#: ../src/client/application/geary-args.vala:27
 msgid "Display program version"
 msgstr "Εμφάνιση έκδοσης του προγράμματος"
 
 #. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:47
+#: ../src/client/application/geary-args.vala:51
 #, c-format
 msgid "Use %s to open a new composer window"
 msgstr "Χρησιμοποιήστε το % s για να ανοίξετε ένα νέο παράθυρο σύνθεσης"
 
-#: ../src/client/application/geary-args.vala:48
+#: ../src/client/application/geary-args.vala:52
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Παρακαλούμε αναφέρετε σχόλια, προτάσεις και σφάλματα σε:"
 
 #. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:55
+#: ../src/client/application/geary-args.vala:59
 #, c-format
 msgid "Failed to parse command line options: %s\n"
 msgstr "Απέτυχε να αναλύσει τις επιλογές της γραμμής εντολών: %s\n"
 
-#: ../src/client/application/geary-args.vala:66
+#: ../src/client/application/geary-args.vala:70
 #, c-format
 msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Άγνωστος επιλογή γραμμής εντολών επιλογή \"%s\"\n"
+msgstr "Άγνωστη επιλογή της γραμμής εντολών \"%s\"\n"
 
-#: ../src/client/application/geary-controller.vala:46
+#: ../src/client/application/geary-controller.vala:56
 msgid "_Delete"
 msgstr "_Διαγραφή"
 
-#: ../src/client/application/geary-controller.vala:47
+#: ../src/client/application/geary-controller.vala:57
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Διαγραφή συνομιλίας (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:48
+#: ../src/client/application/geary-controller.vala:58
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Διαγραφή συνομιλιών (Shift+Delete)"
 
 #. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:52
+#: ../src/client/application/geary-controller.vala:62
 msgid "_Trash"
 msgstr "Απο_ρρίμματα"
 
-#: ../src/client/application/geary-controller.vala:53
+#: ../src/client/application/geary-controller.vala:63
 msgid "Move conversation to trash (Delete, Backspace)"
 msgstr "Μετακίνηση συνομιλίας στα απορρίμματα (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:54
+#: ../src/client/application/geary-controller.vala:64
 msgid "Move conversations to trash (Delete, Backspace)"
 msgstr "Μετακίνηση συνομιλιών στα απορρίμματα (Delete, Backspace)"
 
 #. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:68
 msgid "_Archive"
 msgstr "_Αρχείο"
 
-#: ../src/client/application/geary-controller.vala:59
+#: ../src/client/application/geary-controller.vala:69
 msgid "Archive conversation (A)"
 msgstr "Αρχειοθέτηση συνομιλίας (Α)"
 
-#: ../src/client/application/geary-controller.vala:60
+#: ../src/client/application/geary-controller.vala:70
 msgid "Archive conversations (A)"
 msgstr "Αρχειοθέτηση συνομιλιών (Α)"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:73
 msgid "Mark as S_pam"
 msgstr "Σημείωση ως ανεπι_θύμητα"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:74
 msgid "Mark as not S_pam"
 msgstr "Σημείωση ως μη ανεπιθύ_μητα"
 
-#: ../src/client/application/geary-controller.vala:66
-#: ../src/client/application/geary-controller.vala:277
+#: ../src/client/application/geary-controller.vala:76
+#: ../src/client/application/geary-controller.vala:296
 msgid "Mark conversation"
 msgstr "Σήμανση συνομιλίας"
 
-#: ../src/client/application/geary-controller.vala:67
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark conversations"
 msgstr "Σήμανση συνομιλιών"
 
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:78
 msgid "Add label to conversation"
 msgstr "Προσθήκη ετικέτας στην συνομιλία"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:79
 msgid "Add label to conversations"
 msgstr "Προσθήκη ετικέτας στις συνομιλίες"
 
-#: ../src/client/application/geary-controller.vala:70
-#: ../src/client/application/geary-controller.vala:316
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:335
 msgid "Move conversation"
 msgstr "Μετακίνηση συνομιλίας"
 
-#: ../src/client/application/geary-controller.vala:71
+#: ../src/client/application/geary-controller.vala:81
 msgid "Move conversations"
 msgstr "Μετακίνηση συνομιλιών"
 
-#: ../src/client/application/geary-controller.vala:253
+#: ../src/client/application/geary-controller.vala:272
 msgid "A_ccounts"
 msgstr "Λ_ογαριασμοί"
 
-#: ../src/client/application/geary-controller.vala:258
+#: ../src/client/application/geary-controller.vala:277
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Προτιμήσεις"
 
-#: ../src/client/application/geary-controller.vala:262
+#: ../src/client/application/geary-controller.vala:281
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../src/client/application/geary-controller.vala:266
+#: ../src/client/application/geary-controller.vala:285
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "Σ_χετικά με"
 
-#: ../src/client/application/geary-controller.vala:270
+#: ../src/client/application/geary-controller.vala:289
 msgid "_Donate"
 msgstr "_Δωρεά"
 
-#: ../src/client/application/geary-controller.vala:274
+#: ../src/client/application/geary-controller.vala:293
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "Έ_ξοδος"
 
-#: ../src/client/application/geary-controller.vala:279
+#: ../src/client/application/geary-controller.vala:298
 msgid "_Mark as..."
 msgstr "_Σήμανση ως..."
 
-#: ../src/client/application/geary-controller.vala:285
+#: ../src/client/application/geary-controller.vala:304
 msgid "Mark as _Read"
 msgstr "Σήμανση ως α_ναγνωσμένο"
 
-#: ../src/client/application/geary-controller.vala:291
+#: ../src/client/application/geary-controller.vala:310
 msgid "Mark as _Unread"
 msgstr "Σήμανση ως α_διάβαστο"
 
-#: ../src/client/application/geary-controller.vala:297
+#: ../src/client/application/geary-controller.vala:316
 msgid "_Star"
 msgstr "_Αστέρι"
 
-#: ../src/client/application/geary-controller.vala:302
+#: ../src/client/application/geary-controller.vala:321
 msgid "U_nstar"
 msgstr "Κα_τάργηση αστεριού"
 
-#: ../src/client/application/geary-controller.vala:312
+#: ../src/client/application/geary-controller.vala:331
 msgid "Add label"
 msgstr "Προσθήκη ετικέτας"
 
-#: ../src/client/application/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:332
 msgid "_Label"
 msgstr "_Ετικέτα"
 
-#: ../src/client/application/geary-controller.vala:317
+#: ../src/client/application/geary-controller.vala:336
 msgid "_Move"
 msgstr "_Μετακίνηση"
 
-#: ../src/client/application/geary-controller.vala:321
+#: ../src/client/application/geary-controller.vala:340
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Σύνθεση νέου μηνύματος (Ctrl+N, N)"
 
 #. Reply to a message.
-#: ../src/client/application/geary-controller.vala:325
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1574
+#: ../src/client/application/geary-controller.vala:344
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1730
 msgid "_Reply"
 msgstr "_Απάντηση"
 
-#: ../src/client/application/geary-controller.vala:326
+#: ../src/client/application/geary-controller.vala:345
 msgid "Reply (Ctrl+R, R)"
 msgstr "Απάντηση (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:330
+#: ../src/client/application/geary-controller.vala:349
 msgid "R_eply All"
 msgstr "Α_πάντηση σε όλους"
 
-#: ../src/client/application/geary-controller.vala:331
+#: ../src/client/application/geary-controller.vala:350
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Απάντηση σε όλους (Ctrl+Shift+R, Shift+R)"
 
 #. Forward a message.
-#: ../src/client/application/geary-controller.vala:336
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1584
+#: ../src/client/application/geary-controller.vala:355
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1740
 msgid "_Forward"
 msgstr "_Μπροστά"
 
-#: ../src/client/application/geary-controller.vala:337
+#: ../src/client/application/geary-controller.vala:356
 msgid "Forward (Ctrl+L, F)"
 msgstr "Προώθηση (Ctrl+F, F)"
 
-#: ../src/client/application/geary-controller.vala:620
+#: ../src/client/application/geary-controller.vala:624
+msgid "Unable to store server trust exception"
+msgstr "Αδυναμία αποθήκευσης της εξαίρεσης εμπιστοσύνης του διακομιστή"
+
+#: ../src/client/application/geary-controller.vala:861
 msgid "Your settings are insecure"
 msgstr "Οι ρυθμίσεις σας είναι επισφαλείς"
 
-#: ../src/client/application/geary-controller.vala:621
+#: ../src/client/application/geary-controller.vala:862
 msgid ""
 "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
 "username and password could be read by another person on the network.  Are "
@@ -420,17 +440,17 @@ msgstr ""
 "διαβαστεί από άλλο άτομο στο δίκτυο. Είστε βέβαιοι ότι θέλετε να το κάνετε "
 "αυτό;"
 
-#: ../src/client/application/geary-controller.vala:622
+#: ../src/client/application/geary-controller.vala:863
 msgid "Co_ntinue"
 msgstr "Συ_νεχίστε"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:700
+#: ../src/client/application/geary-controller.vala:941
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Σφάλμα κατά την αποστολή του μηνύματος"
 
-#: ../src/client/application/geary-controller.vala:701
+#: ../src/client/application/geary-controller.vala:942
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -441,12 +461,12 @@ msgstr ""
 
 #. Displayed in the space-limited status bar when a message fails to be uploaded
 #. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:705
+#: ../src/client/application/geary-controller.vala:946
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Σφάλμα κατά την αποθήκευση του μηνύματος"
 
-#: ../src/client/application/geary-controller.vala:706
+#: ../src/client/application/geary-controller.vala:947
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -455,19 +475,19 @@ msgstr ""
 "μηνύματος. Το μήνυμα θα παραμείνει στο φάκελο Εξερχόμενα μέχρι να το "
 "διαγράψετε."
 
-#: ../src/client/application/geary-controller.vala:775
+#: ../src/client/application/geary-controller.vala:1016
 msgid "Labels"
 msgstr "Ετικέτες"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: ../src/client/application/geary-controller.vala:787
+#: ../src/client/application/geary-controller.vala:1028
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Αδύνατο το άνοιγμα της βάσης δεδομένων για το %s"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1029
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -493,20 +513,20 @@ msgstr ""
 "και τα συνημμένα της. <b>Η αλληλογραφία στον διακομιστή σας δεν θα "
 "επηρεαστεί.</b>"
 
-#: ../src/client/application/geary-controller.vala:790
+#: ../src/client/application/geary-controller.vala:1031
 msgid "_Rebuild"
 msgstr "Αναδόμη_ση"
 
-#: ../src/client/application/geary-controller.vala:790
+#: ../src/client/application/geary-controller.vala:1031
 msgid "E_xit"
 msgstr "Έ_ξοδος"
 
-#: ../src/client/application/geary-controller.vala:799
+#: ../src/client/application/geary-controller.vala:1040
 #, c-format
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Αδύνατη η αναδόμηση της βάσης δεδομένων για το \"%s\""
 
-#: ../src/client/application/geary-controller.vala:800
+#: ../src/client/application/geary-controller.vala:1041
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -519,14 +539,14 @@ msgstr ""
 
 #. some other problem opening the account ... as with other flow path, can't run
 #. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:822
-#: ../src/client/application/geary-controller.vala:832
-#: ../src/client/application/geary-controller.vala:843
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/application/geary-controller.vala:1073
+#: ../src/client/application/geary-controller.vala:1084
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "Αδύνατο το άνοιγμα του τοπικού γραμματοκιβωτίου για το %s"
 
-#: ../src/client/application/geary-controller.vala:823
+#: ../src/client/application/geary-controller.vala:1064
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -546,7 +566,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:833
+#: ../src/client/application/geary-controller.vala:1074
 msgid ""
 "The version number of the local mail database is formatted for a newer "
 "version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
@@ -560,7 +580,7 @@ msgstr ""
 "\n"
 "Παρακαλούμε εγκαταστήστε την τελευταία έκδοση του Geary και ξαναδοκιμάστε."
 
-#: ../src/client/application/geary-controller.vala:844
+#: ../src/client/application/geary-controller.vala:1085
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -572,28 +592,32 @@ msgstr ""
 "\n"
 "Παρακαλούμε ελέγξτε τη σύνδεση δικτύου και επανεκκινήστε το Geary."
 
-#: ../src/client/application/geary-controller.vala:1338
+#: ../src/client/application/geary-controller.vala:1592
 #, 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:1341
+#: ../src/client/application/geary-controller.vala:1595
 msgid "translator-credits"
 msgstr ""
-"Δημήτρης Σπίγγος <dmtrs32@gmail.com>\n"
-"George Petsagourakis <petsagouris@gmail.com>\n"
-"ioza1964 <izamboukas@gmail.com>\n"
-"Petros Dias <petrosdias@gmail.com>\n"
-"Μαρία Μαυρίδου <mavridou@gmail.com>"
+"Ελληνική μεταφραστική ομάδα GNOME\n"
+" Δημήτρης Σπίγγος <dmtrs32@gmail.com>\n"
+" Γιώργος Πετσαγκουράκης <petsagouris@gmail.com>\n"
+" Ιωάννης Ζαμπούκας  <izamboukas@gmail.com>\n"
+" Petros Dias <petrosdias@gmail.com>\n"
+" Μαρία Μαυρίδου <mavridou@gmail.com>\n"
+"\n"
+"Για περισσότερες πληροφορίες, επισκεφθείτε τη σελίδα\n"
+"http://gnome.gr/"
 
-#: ../src/client/application/geary-controller.vala:1605
+#: ../src/client/application/geary-controller.vala:1859
 #, c-format
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Είστε βέβαιοι ότι θέλετε να ανοίξετε το \"%s\";"
 
-#: ../src/client/application/geary-controller.vala:1606
+#: ../src/client/application/geary-controller.vala:1860
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -601,16 +625,16 @@ msgstr ""
 "Τα συνημμένα μπορεί να προκαλέσουν βλάβη στο σύστημά σας, αν ανοιχθούν. "
 "Ανοίξτε αρχεία που προέρχονται μόνο από αξιόπιστες πηγές."
 
-#: ../src/client/application/geary-controller.vala:1607
+#: ../src/client/application/geary-controller.vala:1861
 msgid "Don't _ask me again"
 msgstr "Να μην _ερωτηθώ ξανά"
 
-#: ../src/client/application/geary-controller.vala:1625
+#: ../src/client/application/geary-controller.vala:1879
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Ένα αρχείο με όνομα \"%s\" υπάρχει ήδη. Θέλετε να το αντικαταστήσετε;"
 
-#: ../src/client/application/geary-controller.vala:1627
+#: ../src/client/application/geary-controller.vala:1881
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
@@ -618,23 +642,23 @@ msgstr ""
 "Το αρχείο υπάρχει ήδη στο \"%s\". Η αντικατάστασή του θα αντικαταστήσει το "
 "περιεχόμενό του."
 
-#: ../src/client/application/geary-controller.vala:1630
+#: ../src/client/application/geary-controller.vala:1884
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
 #. Find out what to do with the inline composers.
 #. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:1896
+#: ../src/client/application/geary-controller.vala:2166
 msgid "Close open draft messages?"
 msgstr "Κλείσμο ανοιγμένων πρόχειρων μηνυμάτων;"
 
-#: ../src/client/application/geary-controller.vala:2003
+#: ../src/client/application/geary-controller.vala:2269
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Θέλετε να διαγράψετε οριστικά αυτό το μήνυμα;"
 msgstr[1] "Θέλετε να διαγράψετε οριστικά αυτά τα μηνύματα;"
 
-#: ../src/client/application/geary-controller.vala:2005
+#: ../src/client/application/geary-controller.vala:2271
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -668,20 +692,19 @@ msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr ""
 "Αναζητήστε όλη την αλληλογραφία σε λογαριασμό για λέξεις-κλειδιά (Ctrl+S)"
 
-#: ../src/client/components/main-toolbar.vala:196
+#: ../src/client/components/main-toolbar.vala:210
 #, c-format
 msgid "Indexing %s account"
 msgstr "Ευρετηρίαση λογαριασμού %s"
 
-#: ../src/client/components/main-toolbar.vala:207
+#: ../src/client/components/main-toolbar.vala:221
 #: ../src/client/folder-list/folder-list-search-branch.vala:39
 #, c-format
 msgid "Search %s account"
 msgstr "Αναζήτηση λογαριασμού %s"
 
-#: ../src/client/components/main-window.vala:302
+#: ../src/client/components/main-window.vala:347
 #, c-format
-#| msgid "%s (%s)"
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -695,7 +718,8 @@ msgstr "Γίνεται η αποστολή..."
 msgid "_OK"
 msgstr "_Εντάξει"
 
-#: ../src/client/components/stock.vala:19 ../ui/remove_confirm.glade.h:5
+#: ../src/client/components/stock.vala:19 ../ui/password-dialog.glade.h:5
+#: ../ui/remove_confirm.glade.h:5
 msgid "_Cancel"
 msgstr "_Ακύρωση"
 
@@ -722,7 +746,7 @@ msgstr "Α_φαίρεση "
 
 #. Select all.
 #: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1042
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1197
 msgid "Select _All"
 msgstr "Ε_πιλογή όλων"
 
@@ -730,100 +754,119 @@ msgstr "Ε_πιλογή όλων"
 msgid "_Keep"
 msgstr "Δια_τήρηση"
 
-#: ../src/client/composer/composer-widget.vala:53
+#: ../src/client/composer/composer-widget.vala:58
 msgid "Saved"
 msgstr "Αποθηκεύτηκε"
 
-#: ../src/client/composer/composer-widget.vala:54
+#: ../src/client/composer/composer-widget.vala:59
 msgid "Saving"
 msgstr "Αποθηκεύεται"
 
-#: ../src/client/composer/composer-widget.vala:55
+#: ../src/client/composer/composer-widget.vala:60
 msgid "Error saving"
 msgstr "Σφάλμα κατά την αποθήκευση"
 
-#. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../src/client/composer/composer-widget.vala:102
-msgid "attach|enclosed|enclosing|cover letter"
-msgstr "επισύναψη|περιεχόμενο|περικλείω|γράμμα εξώφυλλου"
+#. A list of keywords, separated by pipe ("|") characters, that suggest an attachment; since
+#. this is full-word checking, include all variants of each word.  No spaces are allowed.
+#: ../src/client/composer/composer-widget.vala:121
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
+"enclosing|encloses|enclosure|enclosures"
+msgstr ""
+"επισύναψη|attaching|attaches|συνημμένο|συνημμένα|attached|enclose|enclosed|"
+"enclosing|encloses|enclosure|enclosures"
 
-#: ../src/client/composer/composer-widget.vala:846
+#: ../src/client/composer/composer-widget.vala:907
 msgid "Do you want to discard the unsaved message?"
 msgstr "Θέλετε να απορρίψετε το μη αποθηκευμένο μήνυμα;"
 
-#: ../src/client/composer/composer-widget.vala:849
-#: ../src/client/composer/composer-widget.vala:853
+#: ../src/client/composer/composer-widget.vala:910
+#: ../src/client/composer/composer-widget.vala:914
 msgid "Do you want to discard this message?"
 msgstr "Θέλετε να απορρίψετε αυτό το μήνυμα;"
 
-#: ../src/client/composer/composer-widget.vala:934
+#: ../src/client/composer/composer-widget.vala:1027
 msgid "Send message with an empty subject and body?"
 msgstr "Να αποσταλεί το μήνυμα με κενό θέμα και περιεχόμενο;"
 
-#: ../src/client/composer/composer-widget.vala:936
+#: ../src/client/composer/composer-widget.vala:1029
 msgid "Send message with an empty subject?"
 msgstr "Να αποσταλεί το μήνυμα με κενό θέμα;"
 
-#: ../src/client/composer/composer-widget.vala:938
+#: ../src/client/composer/composer-widget.vala:1031
 msgid "Send message with an empty body?"
 msgstr "Να αποσταλεί το μήνυμα με κενό περιεχόμενο;"
 
-#: ../src/client/composer/composer-widget.vala:940
+#: ../src/client/composer/composer-widget.vala:1033
 msgid "Send message without an attachment?"
 msgstr "Να αποσταλεί το μήνυμα χωρίς συνημμένο;"
 
-#: ../src/client/composer/composer-widget.vala:1123
+#: ../src/client/composer/composer-widget.vala:1216
 msgid "Cannot add attachment"
 msgstr "Δεν είναι δυνατή η προσθήκη συνημμένου"
 
-#: ../src/client/composer/composer-widget.vala:1134
+#: ../src/client/composer/composer-widget.vala:1227
 #, c-format
 msgid "\"%s\" could not be found."
 msgstr "Το \"%s\" δεν ήταν δυνατό να βρεθεί."
 
-#: ../src/client/composer/composer-widget.vala:1141
+#: ../src/client/composer/composer-widget.vala:1234
 #, c-format
 msgid "\"%s\" is a folder."
 msgstr "Το \"%s\" είναι ένας φάκελος."
 
-#: ../src/client/composer/composer-widget.vala:1148
+#: ../src/client/composer/composer-widget.vala:1241
 #, c-format
 msgid "\"%s\" is an empty file."
 msgstr "Το \"%s\" είναι ένα άδειο αρχείο."
 
-#: ../src/client/composer/composer-widget.vala:1162
+#: ../src/client/composer/composer-widget.vala:1255
 #, c-format
 msgid "\"%s\" could not be opened for reading."
 msgstr "Το \"%s\" δεν ήταν δυνατό να ανοιχτεί για ανάγνωση."
 
-#: ../src/client/composer/composer-widget.vala:1169
+#: ../src/client/composer/composer-widget.vala:1262
 #, c-format
 msgid "\"%s\" already attached for delivery."
 msgstr "Το αρχείο \"%s\" έχει ήδη επισυναφθεί για παράδοση."
 
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1178
+#: ../src/client/composer/composer-widget.vala:1271
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-widget.vala:1454
+#: ../src/client/composer/composer-widget.vala:1331
+msgid "To: "
+msgstr "Προς:"
+
+#: ../src/client/composer/composer-widget.vala:1334
+msgid "Cc: "
+msgstr "Κοινοποίηση:"
+
+#: ../src/client/composer/composer-widget.vala:1337
+msgid "Bcc: "
+msgstr "Κρυφή κοιν.:"
+
+#: ../src/client/composer/composer-widget.vala:1340
+msgid "Reply-To: "
+msgstr "Απάντηση σε:"
+
+#: ../src/client/composer/composer-widget.vala:1573
 msgid "Select Color"
 msgstr "Επιλογή χρώματος"
 
 #. Composer label (with mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:1900
+#: ../src/client/composer/composer-widget.vala:2022
 msgid "_From:"
 msgstr "_Από:"
 
 #. For other types of messages, just show the from account.
 #. Composer label (without mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#. Geary account mail will be sent from
-#: ../src/client/composer/composer-widget.vala:1916
-#: ../src/client/conversation-viewer/conversation-viewer.vala:635
-#: ../ui/composer.glade.h:42
+#: ../src/client/composer/composer-widget.vala:2038
+#: ../src/client/conversation-viewer/conversation-viewer.vala:713
 msgid "From:"
 msgstr "Από:"
 
@@ -841,168 +884,168 @@ msgstr "Νέο μήνυμα"
 msgid "Me"
 msgstr "Εγώ"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:260
+#: ../src/client/conversation-viewer/conversation-viewer.vala:338
 msgid "No conversations selected."
 msgstr "Δεν επιλέχθηκαν συνομιλίες."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:262
+#: ../src/client/conversation-viewer/conversation-viewer.vala:340
 #, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u συνομιλία επιλέχθηκε."
 msgstr[1] "%u συνομιλίες επιλέχθηκαν."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:291
+#: ../src/client/conversation-viewer/conversation-viewer.vala:369
 msgid "No search results found."
-msgstr "Δεν υπάρχουν ευρήματα."
+msgstr "Δεν υπάρχουν αποτελέσματα."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:293
+#: ../src/client/conversation-viewer/conversation-viewer.vala:371
 msgid "No conversations in folder."
 msgstr "Δεν υπάρχουν συνομιλίες στον φάκελο."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:534
+#: ../src/client/conversation-viewer/conversation-viewer.vala:612
 msgid "This message contains remote images."
 msgstr "Αυτό το μήνυμα περιέχει απομακρυσμένες εικόνες."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:534
+#: ../src/client/conversation-viewer/conversation-viewer.vala:612
 msgid "Show Images"
 msgstr "Προβολή εικόνων"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:535
+#: ../src/client/conversation-viewer/conversation-viewer.vala:613
 msgid "Always Show From Sender"
 msgstr "Να εμφανίζεται πάντοτε ο αποστολέας"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:559
+#: ../src/client/conversation-viewer/conversation-viewer.vala:637
 msgid "Edit Draft"
 msgstr "Επεξεργασία πρόχειρου μηνύματος"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:638
+#: ../src/client/conversation-viewer/conversation-viewer.vala:716
 msgid "To:"
 msgstr "Προς:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:641
+#: ../src/client/conversation-viewer/conversation-viewer.vala:719
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:644
+#: ../src/client/conversation-viewer/conversation-viewer.vala:722
 msgid "Bcc:"
 msgstr "Κρυφή κοιν.:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:647
+#: ../src/client/conversation-viewer/conversation-viewer.vala:725
 msgid "Subject:"
 msgstr "Θέμα:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:650
+#: ../src/client/conversation-viewer/conversation-viewer.vala:728
 msgid "Date:"
 msgstr "Ημερομηνία:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:857
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1012
 #, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u αναγνωσμένο μήνυμα"
 msgstr[1] "%u αναγνωσμένα μηνύματα"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:989
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1144
 #, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 "Αυτό το μήνυμα στάλθηκε με επιτυχία, αλλά δεν μπόρεσε να αποθηκευτεί στο %s."
 
 #. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1015
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1170
 #: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Αντιγραφή"
 
 #. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1023
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1178
 msgid "Copy _Email Address"
 msgstr "Αντιγραφή _διεύθυνσης ηλεκτρονικού ταχυδρομείου"
 
 #. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1028
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1183
 #: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Αντιγραφή _σύνδεσης"
 
 #. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1036
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1191
 msgid "Select _Message"
 msgstr "Επιλογή _μηνύματος"
 
 #. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1048
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1203
 msgid "_Inspect"
 msgstr "_Επιθεώρηση"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1274
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1429
 msgid "This link appears to go to"
 msgstr "Αυτός ο σύνδεσμος φαίνεται να πηγαίνει στο"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1275
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1430
 msgid "but actually goes to"
 msgstr "στην πραγματικότητα όμως πάει στο"
 
 #. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1485
 msgid " (Invalid?)"
 msgstr " (Άκυρο;)"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1522
-msgid "_Save As..."
-msgstr "_Αποθήκευση ως..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1527
-msgid "Save All A_ttachments..."
-msgstr "Αποθή_κευση όλων των συνημμένων..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1541
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1591
 msgid "_Save Image As..."
 msgstr "Αποθήκευ_ση εικόνας ως..."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1564
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1695
+msgid "_Save As..."
+msgstr "_Αποθήκευση ως..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1700
+msgid "Save All A_ttachments..."
+msgstr "Αποθή_κευση όλων των συνημμένων..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1720
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "Αποθή_κευση συνημμένου..."
 msgstr[1] "Αποθή_κευση όλων των συνημμένων..."
 
 #. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1579
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1735
 msgid "Reply to _All"
 msgstr "Απάντηση σε ό_λους"
 
 #. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1596
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1752
 msgid "_Mark as Read"
 msgstr "_Σήμανση ως αναγνωσμένα"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1600
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1756
 msgid "_Mark as Unread"
 msgstr "_Σήμανση ως μη αναγνωσμένα"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1606
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1762
 msgid "Mark Unread From _Here"
 msgstr "Σημειώστε αδιάβαστα από ε_δώ"
 
 #. Separator.
 #. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1621
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1777
 msgid "_View Source"
 msgstr "_Προβολή προέλευσης"
 
 #. Generate the attachment table.
 #. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1915
-#: ../src/engine/rfc822/rfc822-utils.vala:327
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2101
+#: ../src/engine/rfc822/rfc822-utils.vala:331
 msgid "none"
 msgstr "Κανένα"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2045
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2236
 msgid "Failed to open default text editor."
 msgstr "Απέτυχε να ανοίξετε το προεπιλεγμένο πρόγραμμα επεξεργασίας κειμένου."
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:313
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
 #, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - Επόπτης συνομιλίας"
@@ -1015,13 +1058,103 @@ msgstr "Επιλέξτε ένα αρχείο"
 msgid "_Attach"
 msgstr "_Επισύναψη"
 
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+#, c-format
+msgid "Untrusted Connection: %s"
+msgstr "Αναξιόπιστη σύνδεση: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+#, c-format
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
+"Αδύνατη η επαλήθευση της ταυτότητας του διακομιστή αλληλογραφίας %s στο %s:%u"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
+"Η επιλογή \"Έμπιστος διακομιστής\" ή \"Πάντα εμπιστοσύνη σε αυτόν τον "
+"διακομιστή\" μπορεί να προκαλέσει την μη ασφαλή μετάδοση του ονόματος χρήστη "
+"και του κωδικού πρόσβασής σας."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Η επιλογή \"Μη έμπιστος διακομιστής\" δεν θα επιτρέψει την πρόσβαση του "
+"Geary σε αυτόν τον διακομιστή."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr ""
+"Το Geary δεν θα προσθέσει ή θα ενημερώσει αυτόν τον λογαριασμό ηλεκτρονικής "
+"αλληλογγραφίας."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Η επιλογή \"Μη έμπιστος διακομιστής\" θα διακόψει την πρόσβαση του Geary σε "
+"αυτόν τον λογαριασμό."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
+"Το Geary θα τερματίσει αν δεν έχετε άλλους ανοικτούς λογαριασμούς "
+"ηλεκτρονικής αλληλογγραφίας."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Επικοινωνήστε με το διαχειριστή του συστήματός σας ή τον πάροχο υπηρεσιών "
+"ηλεκτρονικής αλληλογγραφίας, εάν έχετε οποιαδήποτε ερώτηση σχετικά με τα "
+"θέματα αυτά."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
+"Το πιστοποιητικό του διακομιστή δεν είναι υπογεγραμμένο από μια γνωστή αρχή"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
+"Η ταυτότητα του διακομιστή δεν ταιριάζει με την ταυτότητα του πιστοποιητικού"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Το πιστοποιητικό του διακομιστή έχει λήξει"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Το πιστοποιητικό του διακομιστή δεν έχει ενεργοποιηθεί"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr ""
+"Το πιστοποιητικό του διακομιστή έχει ανακληθεί και δεν είναι πλέον έγκυρο"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Το πιστοποιητικό του διακομιστή θεωρείται επισφαλές"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
+"Παρουσιάστηκε σφάλμα κατά την επεξεργασία του πιστοποιητικού του διακομιστή"
+
 #. We can't keep these in the glade file, because Gnome doesn't want markup in translatable
 #. strings, and Glade doesn't support the "larger" size attribute. See this bug report for
 #. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
 #: ../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your password"
+msgid "Geary requires your email password to continue"
 msgstr ""
-"Παρακαλούμε πληκτρολογήστε τον κωδικό πρόσβασης ηλεκτρονικού ταχυδρομείου σας"
+"Το Geary απαιτεί τον κωδικό πρόσβασης του ηλεκτρονικού ταχυδρομείου σας για "
+"να συνεχίσει"
 
 #. Label displaying total number of email messages in a folder
 #: ../src/client/folder-list/folder-list-folder-entry.vala:32
@@ -1119,7 +1252,7 @@ msgstr "%l:%M %P"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: ../src/client/util/util-date.vala:78
 msgid "%b %-e"
-msgstr "%b %-e"
+msgstr "%-e %b"
 
 #. / Date format for dates within a different year, i.e. 02/04/10
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
@@ -1132,20 +1265,20 @@ msgstr "%x"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: ../src/client/util/util-date.vala:88
 msgid "%B %-e, %Y %-l:%M %P"
-msgstr "%B %-e, %Y %-l:%M %P"
+msgstr "%-e %B, %Y %-l:%M %P"
 
 #. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: ../src/client/util/util-date.vala:91
 msgid "%B %-e, %Y %-H:%M"
-msgstr "%B %-e, %Y %-H:%M"
+msgstr "%-e %B, %Y %-H:%M"
 
 #. / Verbose datetime format for the locale default (full month, day and time)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: ../src/client/util/util-date.vala:94
 msgctxt "Default full date"
 msgid "%B %-e, %Y %-l:%M %P"
-msgstr "%B %-e, %Y %-l:%M %P"
+msgstr "%-e %B, %Y %-l:%M %P"
 
 #: ../src/client/util/util-date.vala:164
 msgid "Now"
@@ -1177,7 +1310,7 @@ msgid "%A"
 msgstr "%A"
 
 #: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:741
+#: ../src/engine/rfc822/rfc822-message.vala:747
 msgid "(no subject)"
 msgstr "(χωρίς θέμα)"
 
@@ -1205,13 +1338,21 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
+
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
+
 #: ../src/engine/api/geary-service-provider.vala:52
 msgid "Gmail"
 msgstr "Gmail"
 
 #: ../src/engine/api/geary-service-provider.vala:55
 msgid "Yahoo! Mail"
-msgstr "Ταχυδρομείο Yahoo"
+msgstr "Αλληλογραφία Yahoo!"
 
 #: ../src/engine/api/geary-service-provider.vala:58
 msgid "Outlook.com"
@@ -1267,69 +1408,77 @@ msgstr "Kανένας"
 
 #. 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:662
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:665
 msgid "attachment"
 msgstr "συνημμένο"
 
 #. / Can be typed in the search box like bcc:johndoe@example.com to find
-#. / messages bcc'd to a particular person.
+#. / messages bcc'd to a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
 #. 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
+#: ../src/engine/imap-db/imap-db-account.vala:669
+#: ../src/engine/imap-db/imap-db-account.vala:693
 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:668
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:673
 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:671
-#: ../src/engine/imap-db/imap-db-account.vala:684
+#. / messages cc'd to a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:677
+#: ../src/engine/imap-db/imap-db-account.vala:693
 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:674
-#: ../src/engine/imap-db/imap-db-account.vala:684
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:681
+#: ../src/engine/imap-db/imap-db-account.vala:693
 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:677
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:685
 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:680
-#: ../src/engine/imap-db/imap-db-account.vala:684
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:689
+#: ../src/engine/imap-db/imap-db-account.vala:693
 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
+#. to find mail to or from yourself in search.  The translated
+#. string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:709
 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.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:521
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:535
 msgid "Drafts | Draft"
 msgstr "Πρόχειρα | Πρόχειρο | Drafts | Draft"
 
 #. List of folder names to match for Sent Mail, separated by |.  Please add localized common
 #. names for the Sent Mail 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.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:526
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:540
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 "Απεσταλμένα | Απεσταλμένα μηνύματα | Απεσταλμένα μηνύματα ηλ. ταχυδρομείου | "
@@ -1338,7 +1487,7 @@ msgstr ""
 #. List of folder names to match for Spam, separated by |.  Please add localized common
 #. names for the Spam 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.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:531
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:545
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -1350,7 +1499,7 @@ msgstr ""
 #. List of folder names to match for Trash, separated by |.  Please add localized common
 #. names for the Trash 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.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:536
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:550
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr ""
 "Απορρίμματα | Κάδος απορριμμάτων | Κάδος Ανακύκλωσης | Trash | Rubbish | "
@@ -1358,57 +1507,57 @@ msgstr ""
 
 #. / Format for the datetime that a message being replied to was received
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/engine/rfc822/rfc822-utils.vala:165
+#: ../src/engine/rfc822/rfc822-utils.vala:168
 msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e %b, %Y at %-l:%M %p"
 
 #. / The quoted header for a message being replied to.
 #. / %1$s will be substituted for the date, and %2$s will be substituted for
 #. / the original sender.
-#: ../src/engine/rfc822/rfc822-utils.vala:171
+#: ../src/engine/rfc822/rfc822-utils.vala:174
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "Στις %1$s, ο/η %2$s έγραψε:"
 
 #. / The quoted header for a message being replied to (in case the date is not known).
 #. / %s will be replaced by the original sender.
-#: ../src/engine/rfc822/rfc822-utils.vala:178
+#: ../src/engine/rfc822/rfc822-utils.vala:181
 #, c-format
 msgid "%s wrote:"
 msgstr "%s έγραψε:"
 
 #. / The quoted header for a message being replied to (in case the sender is not known).
 #. / %s will be replaced by the original date
-#: ../src/engine/rfc822/rfc822-utils.vala:184
+#: ../src/engine/rfc822/rfc822-utils.vala:187
 #, c-format
 msgid "On %s:"
 msgstr "Στις %s:"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:211
+#: ../src/engine/rfc822/rfc822-utils.vala:216
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Προωθημένο μήνυμα ----------"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:215
+#: ../src/engine/rfc822/rfc822-utils.vala:220
 #, c-format
 msgid "From: %s\n"
 msgstr "Από: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:216
+#: ../src/engine/rfc822/rfc822-utils.vala:221
 #, c-format
 msgid "Subject: %s\n"
 msgstr "Θέμα %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:217
+#: ../src/engine/rfc822/rfc822-utils.vala:222
 #, c-format
 msgid "Date: %s\n"
 msgstr "Ημερομηνία:%s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:220
+#: ../src/engine/rfc822/rfc822-utils.vala:225
 #, c-format
 msgid "To: %s\n"
 msgstr "Προς: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:223
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 #, c-format
 msgid "Cc: %s\n"
 msgstr "Κοινοποίηση: %s\n"
@@ -1443,6 +1592,22 @@ msgstr "Αφαίρεση λογαριασμού"
 msgid "Please wait while Geary validates your account."
 msgstr "Παρακαλούμε περιμένετε όσο το Geary επικυρώνει τον λογαριασμό σας."
 
+#: ../ui/certificate_warning_dialog.glade.h:1
+msgid "Untrusted Connection"
+msgstr "Μη έμπιστη σύνδεση"
+
+#: ../ui/certificate_warning_dialog.glade.h:2
+msgid "_Always Trust This Server"
+msgstr "Πάντ_α εμπιστοσύνη σε αυτόν τον διακομιστή"
+
+#: ../ui/certificate_warning_dialog.glade.h:3
+msgid "_Trust This Server"
+msgstr "Έμ_πιστος διακομιστής"
+
+#: ../ui/certificate_warning_dialog.glade.h:4
+msgid "_Don't Trust This Server"
+msgstr "Μη έμπιστος _διακομιστής"
+
 #: ../ui/composer.glade.h:1
 msgid "_Undo"
 msgstr "Α_ναίρεση"
@@ -1518,110 +1683,126 @@ msgstr "Υπογραμμισμένη γραφή (Ctrl+U)"
 
 #: ../ui/composer.glade.h:21
 msgid "Strikethrough (Ctrl+K)"
-msgstr "Διαγραμμισμένη γραφή (Ctrl+K)"
+msgstr "Επιγραμμισμένη γραφή (Ctrl+K)"
 
 #: ../ui/composer.glade.h:22
 msgid "_Rich Text"
 msgstr "Κείμενο _πλούσιας μορφής"
 
 #: ../ui/composer.glade.h:23
+msgid "Show Extended Fields"
+msgstr "Εμφάνιση εκτεταμένων πεδίων"
+
+#: ../ui/composer.glade.h:24
 msgid "Lar_ge"
 msgstr "_Μεγάλα"
 
-#: ../ui/composer.glade.h:24
+#: ../ui/composer.glade.h:25
 msgid "Large"
 msgstr "Μεγάλο"
 
-#: ../ui/composer.glade.h:25
+#: ../ui/composer.glade.h:26
 msgid "_Medium"
 msgstr "Με_σαία"
 
-#: ../ui/composer.glade.h:26
+#: ../ui/composer.glade.h:27
 msgid "Medium"
 msgstr "Μεσαίο"
 
-#: ../ui/composer.glade.h:27
+#: ../ui/composer.glade.h:28
 msgid "_Small"
 msgstr "Μι_κρά"
 
-#: ../ui/composer.glade.h:28
+#: ../ui/composer.glade.h:29
 msgid "Small"
 msgstr "Μικρό"
 
-#: ../ui/composer.glade.h:29
+#: ../ui/composer.glade.h:30
 msgid "S_ans Serif"
 msgstr "_Χωρίς πατούρα (Sans Serif)"
 
-#: ../ui/composer.glade.h:30
+#: ../ui/composer.glade.h:31
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: ../ui/composer.glade.h:31
+#: ../ui/composer.glade.h:32
 msgid "S_erif"
 msgstr "_Με πατούρα (Serif)"
 
-#: ../ui/composer.glade.h:32
+#: ../ui/composer.glade.h:33
 msgid "Serif"
 msgstr "Serif"
 
-#: ../ui/composer.glade.h:33
+#: ../ui/composer.glade.h:34
 msgid "_Fixed Width"
 msgstr "_Σταθερό πλάτος"
 
-#: ../ui/composer.glade.h:34
+#: ../ui/composer.glade.h:35
 msgid "Fixed Width"
 msgstr "Σταθερό πλάτος"
 
-#: ../ui/composer.glade.h:35
-msgid "Edit recipients"
-msgstr "Επεξεργασία παραληπτών"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:37
-msgid "_To:"
-msgstr "Πρ_ος:"
-
-#: ../ui/composer.glade.h:38
-msgid "_Cc:"
-msgstr "_Κοινοποίηση:"
-
-#: ../ui/composer.glade.h:39
-msgid "_Subject:"
-msgstr "_Θέμα:"
-
-#: ../ui/composer.glade.h:40
-msgid "_Bcc:"
-msgstr "Κρ_υφή κοιν.:"
-
-#: ../ui/composer.glade.h:43
-msgid "Drop files here"
-msgstr "Αφήστε τα αρχεία εδώ"
-
-#: ../ui/composer.glade.h:44
-msgid "To add them as attachments"
-msgstr "Για να τα προσθέσετε ως συνημμένα"
-
-#: ../ui/composer.glade.h:45
-msgid "_Attach File"
-msgstr "_Επισύναψη αρχείου"
-
-#: ../ui/composer.glade.h:46
-msgid "_Include Original Attachments"
-msgstr "Να _συμπεριλαμβάνονται τα αρχικά συνημμένα"
-
-#: ../ui/composer.glade.h:47
-msgid "C_lose"
-msgstr "Κ_λείσιμο"
-
-#: ../ui/composer.glade.h:48
-#| msgid "_Attach"
+#: ../ui/composer.glade.h:36
 msgid "Detach"
 msgstr "Απόσπαση"
 
-#: ../ui/composer.glade.h:49
+#: ../ui/composer.glade.h:37
 msgid "_Send"
 msgstr "Α_ποστολή"
 
+#: ../ui/composer.glade.h:38
+msgid "Send"
+msgstr "Αποστολή"
+
+#: ../ui/composer.glade.h:39
+msgid "_Attach File"
+msgstr "_Επισύναψη αρχείου"
+
+#: ../ui/composer.glade.h:40
+msgid "Attach File"
+msgstr "Επισύναψη αρχείου"
+
+#: ../ui/composer.glade.h:41
+msgid "_Include Original Attachments"
+msgstr "Να _συμπεριλαμβάνονται τα αρχικά συνημμένα"
+
+#: ../ui/composer.glade.h:42
+msgid "Include Original Attachments"
+msgstr "Να συμπεριλαμβάνονται τα αρχικά συνημμένα"
+
+#. Address(es) e-mail is to be sent to
+#: ../ui/composer.glade.h:44
+msgid "_To"
+msgstr "Πρ_ος"
+
+#: ../ui/composer.glade.h:45
+msgid "_Cc"
+msgstr "_Κοινοποίηση"
+
+#: ../ui/composer.glade.h:46
+msgid "_Subject"
+msgstr "_Θέμα"
+
+#: ../ui/composer.glade.h:47
+msgid "_Bcc"
+msgstr "Κρ_υφή κοιν."
+
+#: ../ui/composer.glade.h:48
+msgid "_Reply-To"
+msgstr "Απά_ντηση σε:"
+
+#. Geary account mail will be sent from
+#: ../ui/composer.glade.h:50
+msgid "From"
+msgstr "Από"
+
+#: ../ui/composer.glade.h:51
+msgid "Drop files here"
+msgstr "Αφήστε τα αρχεία εδώ"
+
+#: ../ui/composer.glade.h:52
+msgid "To add them as attachments"
+msgstr "Για να τα προσθέσετε ως συνημμένα"
+
 #: ../ui/find_bar.glade.h:1
 msgid "Find:"
 msgstr "Εύρεση:"
@@ -1642,32 +1823,27 @@ msgstr "_Διάκριση πεζών/κεφαλαίων"
 msgid "label"
 msgstr "ετικέτα"
 
-#: ../ui/login.glade.h:1
+#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
 msgid "Password"
 msgstr "Κωδικός πρόσβασης"
 
 #: ../ui/login.glade.h:2
-#| msgid "E_mail address:"
 msgid "E_mail address"
 msgstr "Διεύθυνση ηλεκτρονικού _ταχυδρομίου"
 
 #: ../ui/login.glade.h:3
-#| msgid "_Password:"
 msgid "_Password"
 msgstr "_Κωδικός πρόσβασης"
 
 #: ../ui/login.glade.h:4
-#| msgid "S_ervice:"
 msgid "S_ervice"
 msgstr "_Υπηρεσία"
 
 #: ../ui/login.glade.h:5
-#| msgid "N_ame:"
 msgid "N_ame"
 msgstr "Όν_ομα"
 
 #: ../ui/login.glade.h:7
-#| msgid "N_ickname:"
 msgid "N_ickname"
 msgstr "_Ψευδώνυμο"
 
@@ -1684,22 +1860,18 @@ msgid "IMAP settings"
 msgstr "Ρυθμίσεις IMAP"
 
 #: ../ui/login.glade.h:11
-#| msgid "Se_rver:"
 msgid "Se_rver"
 msgstr "Δ_ιακομιστής"
 
 #: ../ui/login.glade.h:12
-#| msgid "P_ort:"
 msgid "P_ort"
 msgstr "_Θύρα"
 
 #: ../ui/login.glade.h:13
-#| msgid "Ser_ver:"
 msgid "Ser_ver"
 msgstr "Δ_ιακομιστής"
 
 #: ../ui/login.glade.h:14
-#| msgid "Por_t:"
 msgid "Por_t"
 msgstr "Θύ_ρα"
 
@@ -1708,12 +1880,10 @@ msgid "SMTP settings"
 msgstr "Ρυθμίσεις SMTP"
 
 #: ../ui/login.glade.h:16
-#| msgid "User_name:"
 msgid "User_name"
 msgstr "Όνομα_χρήστη"
 
 #: ../ui/login.glade.h:17
-#| msgid "Pass_word:"
 msgid "Pass_word"
 msgstr "Κ_ωδικός πρόσβασης"
 
@@ -1726,7 +1896,6 @@ msgid "SMTP password"
 msgstr "Κωδικός πρόσβασης SMTP"
 
 #: ../ui/login.glade.h:20
-#| msgid "_Username:"
 msgid "_Username"
 msgstr "Ό_νομα χρήστη"
 
@@ -1739,12 +1908,10 @@ msgid "IMAP password"
 msgstr "Κωδικός πρόσβασης IMAP"
 
 #: ../ui/login.glade.h:23
-#| msgid "Encr_yption:"
 msgid "Encr_yption"
 msgstr "Κρυπ_τογράφηση"
 
 #: ../ui/login.glade.h:24
-#| msgid "Encrypt_ion:"
 msgid "Encrypt_ion"
 msgstr "Κρυπτογράφ_ηση"
 
@@ -1769,7 +1936,6 @@ msgid "Storage"
 msgstr "Αποθήκευση"
 
 #: ../ui/login.glade.h:31
-#| msgid "_Download mail:"
 msgid "_Download mail"
 msgstr "_Λήψη αλληλογραφίας"
 
@@ -1790,19 +1956,18 @@ msgid "SMTP Credentials"
 msgstr "Διαπιστευτήρια SMTP"
 
 #: ../ui/password-dialog.glade.h:2
-msgid "Username:"
-msgstr "Όνομα χρήστη:"
-
-#: ../ui/password-dialog.glade.h:3
-msgid "Password:"
-msgstr "Κωδικός πρόσβασης:"
+msgid "Username"
+msgstr "Όνομα χρήστη"
 
 #: ../ui/password-dialog.glade.h:4
 msgid "_Remember password"
 msgstr "Α_πομνημόνευση κωδικού πρόσβασης"
 
+#: ../ui/password-dialog.glade.h:6
+msgid "_Authenticate"
+msgstr "_Πιστοποίηση"
+
 #: ../ui/preferences.glade.h:1
-#| msgid "_Preferences"
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
@@ -1834,6 +1999,10 @@ msgstr "Α_ναπαραγωγή ήχων ειδοποίησης"
 msgid "Show _notifications for new mail"
 msgstr "Εμφάνιση ειδοποιήσεων για _νέα μηνύματα"
 
+#: ../ui/preferences.glade.h:11
+msgid "Notify of new mail at start_up"
+msgstr "Ειδοποίηση για νέα αλληλογραφία κατά την εκκί_νηση"
+
 #: ../ui/remove_confirm.glade.h:1
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
@@ -1860,7 +2029,27 @@ msgstr "Διεύθυνση ηλεκτρονικού ταχυδρομείου:"
 
 #: ../ui/upgrade_dialog.glade.h:1
 msgid "Geary upgrade in progress."
-msgstr "Η αναβάθμιση του Geary σε εξέλιξη."
+msgstr "Η αναβάθμιση του Geary είναι σε εξέλιξη."
+
+#~ msgid "attach|enclosed|enclosing|cover letter"
+#~ msgstr "επισύναψη|περιεχόμενο|περικλείω|γράμμα εξώφυλλου"
+
+#~ msgid "Please enter your password"
+#~ msgstr ""
+#~ "Παρακαλούμε πληκτρολογήστε τον κωδικό πρόσβασης ηλεκτρονικού ταχυδρομείου "
+#~ "σας"
+
+#~ msgid "Username:"
+#~ msgstr "Όνομα χρήστη:"
+
+#~ msgid "Password:"
+#~ msgstr "Κωδικός πρόσβασης:"
+
+#~ msgid "Edit recipients"
+#~ msgstr "Επεξεργασία παραληπτών"
+
+#~ msgid "C_lose"
+#~ msgstr "Κ_λείσιμο"
 
 #~ msgid "Unable to login to email server"
 #~ msgstr "Δεν είναι δυνατή η σύνδεση στο διακομιστή ηλεκτρονικού ταχυδρομείου"