diff --git a/po/mailnag.pot b/po/mailnag.pot
index 1ddc59e..b80d592 100644
--- a/po/mailnag.pot
+++ b/po/mailnag.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-31 21:20+0100\n"
+"POT-Creation-Date: 2015-12-20 14:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,46 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: Mailnag/common/accounts.py:49
-msgid "Unnamed"
-msgstr ""
-
-#: Mailnag/plugins/unityplugin.py:98
-msgid "Ubuntu Unity"
-msgstr ""
-
-#: Mailnag/plugins/unityplugin.py:99
-msgid "Shows new mails in Ubuntu's Messaging menu."
-msgstr ""
-
-#: Mailnag/plugins/unityplugin.py:118 Mailnag/plugins/libnotifyplugin.py:160
-msgid "Maximum number of visible mails:"
-msgstr ""
-
-#: Mailnag/plugins/goaplugin.py:92
-msgid "GNOME Online Accounts"
-msgstr ""
-
-#: Mailnag/plugins/goaplugin.py:93
-msgid "GNOME Online Accounts Integration."
-msgstr ""
-
-#: Mailnag/plugins/dbusplugin.py:83
-msgid "DBus Service"
-msgstr ""
-
-#: Mailnag/plugins/dbusplugin.py:84
-msgid "Exposes Mailnag's functionality via a DBus service."
-msgstr ""
-
-#: Mailnag/plugins/soundplugin.py:65
-msgid "Sound Notifications"
-msgstr ""
-
-#: Mailnag/plugins/soundplugin.py:66
-msgid "Plays a sound when new mails arrive."
-msgstr ""
-
 #: Mailnag/plugins/userscriptplugin.py:62
 msgid "User Script"
 msgstr ""
@@ -81,6 +41,18 @@ msgid ""
 "followed by %s pairs."
 msgstr ""
 
+#: Mailnag/plugins/unityplugin.py:98
+msgid "Ubuntu Unity"
+msgstr ""
+
+#: Mailnag/plugins/unityplugin.py:99
+msgid "Shows new mails in Ubuntu's Messaging menu."
+msgstr ""
+
+#: Mailnag/plugins/unityplugin.py:118
+msgid "Maximum number of visible mails:"
+msgstr ""
+
 #: Mailnag/plugins/spamfilterplugin.py:69
 msgid "Spam Filter"
 msgstr ""
@@ -95,62 +67,105 @@ msgid ""
 "the following words in subject or sender."
 msgstr ""
 
-#: Mailnag/plugins/libnotifyplugin.py:116
+#: Mailnag/plugins/libnotifyplugin.py:100
 msgid "LibNotify Notifications"
 msgstr ""
 
-#: Mailnag/plugins/libnotifyplugin.py:117
+#: Mailnag/plugins/libnotifyplugin.py:101
 msgid "Shows a popup when new mails arrive."
 msgstr ""
 
-#: Mailnag/plugins/libnotifyplugin.py:137
-msgid "Notification mode:"
-msgstr ""
-
-#: Mailnag/plugins/libnotifyplugin.py:145
+#: Mailnag/plugins/libnotifyplugin.py:117
 msgid "Count of new mails"
 msgstr ""
 
-#: Mailnag/plugins/libnotifyplugin.py:148
-msgid "Summary of new mails"
+#: Mailnag/plugins/libnotifyplugin.py:118
+msgid "Short summary of new mails"
 msgstr ""
 
-#: Mailnag/plugins/libnotifyplugin.py:151
+#: Mailnag/plugins/libnotifyplugin.py:119
+msgid "Detailed summary of new mails"
+msgstr ""
+
+#: Mailnag/plugins/libnotifyplugin.py:120
 msgid "One notification per new mail"
 msgstr ""
 
-#: Mailnag/plugins/libnotifyplugin.py:249
-#: Mailnag/plugins/libnotifyplugin.py:251
-#, python-brace-format
-msgid "(and {0} more)"
+#: Mailnag/plugins/libnotifyplugin.py:128
+msgid "Notification mode:"
 msgstr ""
 
-#: Mailnag/plugins/libnotifyplugin.py:254
-#: Mailnag/plugins/libnotifyplugin.py:282
+#: Mailnag/plugins/libnotifyplugin.py:215
+#: Mailnag/plugins/libnotifyplugin.py:251
+#: Mailnag/plugins/libnotifyplugin.py:279
 #, python-brace-format
 msgid "{0} new mails"
 msgstr ""
 
-#: Mailnag/plugins/libnotifyplugin.py:256
-#: Mailnag/plugins/libnotifyplugin.py:284
+#: Mailnag/plugins/libnotifyplugin.py:217
+#, python-brace-format
+msgid "From {0} and others."
+msgstr ""
+
+#: Mailnag/plugins/libnotifyplugin.py:219
+#: Mailnag/plugins/libnotifyplugin.py:222
+#, python-brace-format
+msgid "From {0}."
+msgstr ""
+
+#: Mailnag/plugins/libnotifyplugin.py:221
+#: Mailnag/plugins/libnotifyplugin.py:253
+#: Mailnag/plugins/libnotifyplugin.py:281
 msgid "New mail"
 msgstr ""
 
-#: Mailnag/plugins/libnotifyplugin.py:271
+#: Mailnag/plugins/libnotifyplugin.py:246
+#: Mailnag/plugins/libnotifyplugin.py:248
+#, python-brace-format
+msgid "(and {0} more)"
+msgstr ""
+
+#: Mailnag/plugins/libnotifyplugin.py:268
 msgid "Mark as read"
 msgstr ""
 
+#: Mailnag/plugins/soundplugin.py:65
+msgid "Sound Notifications"
+msgstr ""
+
+#: Mailnag/plugins/soundplugin.py:66
+msgid "Plays a sound when new mails arrive."
+msgstr ""
+
+#: Mailnag/plugins/goaplugin.py:93
+msgid "GNOME Online Accounts"
+msgstr ""
+
+#: Mailnag/plugins/goaplugin.py:94
+msgid "GNOME Online Accounts Integration."
+msgstr ""
+
+#: Mailnag/plugins/dbusplugin.py:83
+msgid "DBus Service"
+msgstr ""
+
+#: Mailnag/plugins/dbusplugin.py:84
+msgid "Exposes Mailnag's functionality via a DBus service."
+msgstr ""
+
 #: Mailnag/daemon/mails.py:170
 msgid "No subject"
 msgstr ""
 
 #: Mailnag/configuration/configwindow.py:108
 #: Mailnag/configuration/configwindow.py:133
+#: Mailnag/configuration/accountdialog.py:88
 msgid "Enabled"
 msgstr ""
 
 #: Mailnag/configuration/configwindow.py:114
 #: Mailnag/configuration/configwindow.py:140
+#: Mailnag/configuration/accountdialog.py:94
 msgid "Name"
 msgstr ""
 
@@ -158,19 +173,22 @@ msgstr ""
 msgid "Delete this account:"
 msgstr ""
 
-#: Mailnag/configuration/accountdialog.py:75
-#: Mailnag/configuration/accountdialog.py:76
+#: Mailnag/configuration/accountdialog.py:84
 msgid "optional"
 msgstr ""
 
-#: Mailnag/configuration/accountdialog.py:141
+#: Mailnag/configuration/accountdialog.py:177
 msgid "Other (IMAP)"
 msgstr ""
 
-#: Mailnag/configuration/accountdialog.py:142
+#: Mailnag/configuration/accountdialog.py:178
 msgid "Other (POP3)"
 msgstr ""
 
+#: Mailnag/configuration/accountdialog.py:271
+msgid "Connection failed."
+msgstr ""
+
 #: data/account_dialog.ui.h:1
 msgid "Mail Account"
 msgstr ""
@@ -208,7 +226,7 @@ msgid "Port:"
 msgstr ""
 
 #: data/account_dialog.ui.h:10
-msgid "Folders:"
+msgid "Folders (optional)"
 msgstr ""
 
 #: data/config_window.ui.h:1