diff --git a/apps/susimail/locale/messages_en.po b/apps/susimail/locale/messages_en.po
index e81c43cfadd42a04b4fe6e49ee0756b24cce0558..6cd54eeedced0235f72a651337c66d5e065d7437 100644
--- a/apps/susimail/locale/messages_en.po
+++ b/apps/susimail/locale/messages_en.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P susimail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-09 19:27+0000\n"
+"POT-Creation-Date: 2014-05-01 11:45+0000\n"
 "PO-Revision-Date: 2010-06-15 14:09+0100\n"
 "Last-Translator: duck <duck@mail.i2p>\n"
 "Language-Team: duck <duck@mail.i2p>\n"
@@ -18,428 +18,500 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/src/i2p/susi/webmail/WebMail.java:443
-msgid "unknown"
+#: src/src/i2p/susi/webmail/MailPart.java:207
+#, java-format
+msgid "No encoder found for encoding \\''{0}\\''."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:462
-msgid "Warning: no transfer encoding found, fallback to 7bit."
+#: src/src/i2p/susi/webmail/WebMail.java:304
+#: src/src/i2p/susi/webmail/WebMail.java:318
+#: src/src/i2p/susi/webmail/WebMail.java:1005
+msgid "Re:"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:467
-#, java-format
-msgid "No encoder found for encoding \\''{0}\\''."
+#: src/src/i2p/susi/webmail/WebMail.java:308
+#: src/src/i2p/susi/webmail/WebMail.java:322
+#: src/src/i2p/susi/webmail/WebMail.java:1043
+msgid "Fwd:"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:473
+#: src/src/i2p/susi/webmail/WebMail.java:594
+msgid "unknown"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:615
 msgid "Warning: no charset found, fallback to US-ASCII."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:487
+#: src/src/i2p/susi/webmail/WebMail.java:629
 #, java-format
 msgid "Charset \\''{0}\\'' not supported."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:491
+#: src/src/i2p/susi/webmail/WebMail.java:633
 #, java-format
 msgid "Part ({0}) not shown, because of {1}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:514
-msgid "Download"
+#: src/src/i2p/susi/webmail/WebMail.java:669
+#: src/src/i2p/susi/webmail/WebMail.java:672
+#, java-format
+msgid "Download attachment {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:514
+#: src/src/i2p/susi/webmail/WebMail.java:673
 msgid "File is packed into a zipfile for security reasons."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:514
-#, java-format
-msgid "attachment ({0})."
-msgstr ""
-
-#: src/src/i2p/susi/webmail/WebMail.java:518
+#: src/src/i2p/susi/webmail/WebMail.java:678
 #, java-format
 msgid "Attachment ({0})."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:568
+#: src/src/i2p/susi/webmail/WebMail.java:729
 msgid "Need username for authentication."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:572
+#: src/src/i2p/susi/webmail/WebMail.java:733
 msgid "Need password for authentication."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:576
+#: src/src/i2p/susi/webmail/WebMail.java:737
 msgid "Need hostname for connect."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:581
+#: src/src/i2p/susi/webmail/WebMail.java:742
 msgid "Need port number for pop3 connect."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:588
+#: src/src/i2p/susi/webmail/WebMail.java:749
 msgid "POP3 port number is not in range 0..65535."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:594
+#: src/src/i2p/susi/webmail/WebMail.java:755
 msgid "POP3 port number is invalid."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:600
+#: src/src/i2p/susi/webmail/WebMail.java:761
 msgid "Need port number for smtp connect."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:607
+#: src/src/i2p/susi/webmail/WebMail.java:768
 msgid "SMTP port number is not in range 0..65535."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:613
+#: src/src/i2p/susi/webmail/WebMail.java:774
 msgid "SMTP port number is invalid."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:660
+#: src/src/i2p/susi/webmail/WebMail.java:848
 msgid "User logged out."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:664
+#: src/src/i2p/susi/webmail/WebMail.java:851
 msgid "Internal error, lost connection."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:760
+#: src/src/i2p/susi/webmail/WebMail.java:1008
 #, java-format
 msgid "On {0} {1} wrote:"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:807
+#: src/src/i2p/susi/webmail/WebMail.java:1055
 msgid "begin forwarded mail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:829
+#: src/src/i2p/susi/webmail/WebMail.java:1077
 msgid "end forwarded mail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:836
-#: src/src/i2p/susi/webmail/WebMail.java:1769
+#: src/src/i2p/susi/webmail/WebMail.java:1084
+#: src/src/i2p/susi/webmail/WebMail.java:2290
 msgid "Could not fetch mail body."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:864
+#: src/src/i2p/susi/webmail/WebMail.java:1114
 msgid "Message id not valid."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:947
+#: src/src/i2p/susi/webmail/WebMail.java:1152
+msgid "Configuration reloaded"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1213
 #, java-format
 msgid "No Encoding found for {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:951
+#: src/src/i2p/susi/webmail/WebMail.java:1217
 #, java-format
 msgid "Could not encode data: {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:956
+#: src/src/i2p/susi/webmail/WebMail.java:1222
 #, java-format
 msgid "Error reading uploaded file: {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1034
-msgid "Error parsing download parameter."
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1307
+#: src/src/i2p/susi/webmail/WebMail.java:1310
+msgid "Attachment not found."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1078
+#: src/src/i2p/susi/webmail/WebMail.java:1357
+#: src/src/i2p/susi/webmail/WebMail.java:1483
 msgid "Invalid pagesize number, resetting to default value."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1102
+#: src/src/i2p/susi/webmail/WebMail.java:1381
 msgid "No messages marked for deletion."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1122
-#, java-format
-msgid "Error deleting message: {0}"
-msgstr ""
-
-#: src/src/i2p/susi/webmail/WebMail.java:1133
+#: src/src/i2p/susi/webmail/WebMail.java:1397
 #, java-format
 msgid "1 message deleted."
 msgid_plural "{0} messages deleted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1314
-#: src/src/i2p/susi/webmail/WebMail.java:1653
+#: src/src/i2p/susi/webmail/WebMail.java:1462
+msgid "Configuration saved"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1673
+#: src/src/i2p/susi/webmail/WebMail.java:2085
 msgid "Login"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1316
+#. mailbox.getNumMails() forces a connection, don't use it
+#. Not only does it slow things down, but a failure causes all our messages to "vanish"
+#. subtitle = ngettext("1 Message", "{0} Messages", sessionObject.mailbox.getNumMails());
+#: src/src/i2p/susi/webmail/WebMail.java:1678
 #, java-format
 msgid "1 Message"
 msgid_plural "{0} Messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1318
+#: src/src/i2p/susi/webmail/WebMail.java:1684
 msgid "Show Message"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1384
-#, java-format
-msgid "Error decoding content: {0}"
+#: src/src/i2p/susi/webmail/WebMail.java:1686
+msgid "New Message"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1389
-msgid "Error decoding content: No encoder found."
+#: src/src/i2p/susi/webmail/WebMail.java:1688
+msgid "Configuration"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1436
-msgid "no subject"
+#: src/src/i2p/susi/webmail/WebMail.java:1699
+msgid "SusiMail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1453
-msgid "Found no valid sender address."
+#: src/src/i2p/susi/webmail/WebMail.java:1712
+msgid "Message has not been sent. Do you want to discard it?"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1459
+#: src/src/i2p/susi/webmail/WebMail.java:1773
 #, java-format
-msgid "Found no valid address in \\''{0}\\''."
+msgid "Error decoding content: {0}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1478
-msgid "No recipients found."
+#: src/src/i2p/susi/webmail/WebMail.java:1833
+msgid "no subject"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1485
-msgid "Quoted printable encoder not available."
+#: src/src/i2p/susi/webmail/WebMail.java:1850
+msgid "Found no valid sender address."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1490
-msgid "Header line encoder not available."
+#: src/src/i2p/susi/webmail/WebMail.java:1856
+#, java-format
+msgid "Found no valid address in \\''{0}\\''."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1540
+#: src/src/i2p/susi/webmail/WebMail.java:1877
+msgid "No recipients found."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1941
 msgid "Mail sent."
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1579
+#: src/src/i2p/susi/webmail/WebMail.java:1985
 msgid "Send"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1580
+#: src/src/i2p/susi/webmail/WebMail.java:1986
+#: src/src/i2p/susi/webmail/WebMail.java:2199
+#: src/src/i2p/susi/webmail/WebMail.java:2330
 msgid "Cancel"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1581
-msgid "Delete Attachment"
-msgstr ""
-
-#: src/src/i2p/susi/webmail/WebMail.java:1582
-#: src/src/i2p/susi/webmail/WebMail.java:1675
-#: src/src/i2p/susi/webmail/WebMail.java:1756
-msgid "Reload Config"
-msgstr ""
-
-#: src/src/i2p/susi/webmail/WebMail.java:1583
-#: src/src/i2p/susi/webmail/WebMail.java:1676
-#: src/src/i2p/susi/webmail/WebMail.java:1757
-msgid "Logout"
+#: src/src/i2p/susi/webmail/WebMail.java:2029
+#: src/src/i2p/susi/webmail/WebMail.java:2128
+#: src/src/i2p/susi/webmail/WebMail.java:2278
+msgid "From"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1606
-#: src/src/i2p/susi/webmail/WebMail.java:1761
-msgid "From:"
+#: src/src/i2p/susi/webmail/WebMail.java:2030
+msgid "To"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1607
-msgid "To:"
+#: src/src/i2p/susi/webmail/WebMail.java:2031
+msgid "Cc"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1608
-msgid "Cc:"
+#: src/src/i2p/susi/webmail/WebMail.java:2032
+msgid "Bcc"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1609
-msgid "Bcc:"
+#: src/src/i2p/susi/webmail/WebMail.java:2033
+msgid "Bcc to self"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1610
-#: src/src/i2p/susi/webmail/WebMail.java:1763
-msgid "Subject:"
+#: src/src/i2p/susi/webmail/WebMail.java:2034
+#: src/src/i2p/susi/webmail/WebMail.java:2129
+#: src/src/i2p/susi/webmail/WebMail.java:2280
+msgid "Subject"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1611
-msgid "Bcc to self"
+#: src/src/i2p/susi/webmail/WebMail.java:2037
+msgid "Add Attachment"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "New Attachment:"
+#. TODO disable/hide in JS if no file selected
+#: src/src/i2p/susi/webmail/WebMail.java:2039
+msgid "Add another attachment"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1614
-msgid "Upload File"
+#: src/src/i2p/susi/webmail/WebMail.java:2045
+msgid "Attachments"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1620
-msgid "Attachments:"
+#: src/src/i2p/susi/webmail/WebMail.java:2054
+msgid "Delete selected attachments"
 msgstr ""
 
 #. current postman hq length limits 16/12, new postman version 32/32
-#: src/src/i2p/susi/webmail/WebMail.java:1642
+#: src/src/i2p/susi/webmail/WebMail.java:2073
 msgid "User"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1643
+#: src/src/i2p/susi/webmail/WebMail.java:2074
 msgid "Password"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1648
+#: src/src/i2p/susi/webmail/WebMail.java:2079
 msgid "Host"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1649
-msgid "POP3-Port"
+#: src/src/i2p/susi/webmail/WebMail.java:2080
+msgid "POP3 Port"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1650
-msgid "SMTP-Port"
+#: src/src/i2p/susi/webmail/WebMail.java:2081
+msgid "SMTP Port"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1653
-msgid "Reset"
+#: src/src/i2p/susi/webmail/WebMail.java:2086
+msgid "Read Mail Offline"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1654
+#: src/src/i2p/susi/webmail/WebMail.java:2090
+#: src/src/i2p/susi/webmail/WebMail.java:2218
+msgid "Settings"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2093
 msgid "Learn about I2P mail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1655
+#: src/src/i2p/susi/webmail/WebMail.java:2094
 msgid "Create Account"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1667
-msgid "Really delete the marked messages?"
+#: src/src/i2p/susi/webmail/WebMail.java:2107
+#: src/src/i2p/susi/webmail/WebMail.java:2262
+msgid "New"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1667
-msgid "Yes, really delete them!"
+#. In theory, these are valid and will apply to the first checked message,
+#. but that's not obvious and did it work?
+#. button( REPLY, _("Reply") ) +
+#. button( REPLYALL, _("Reply All") ) +
+#. button( FORWARD, _("Forward") ) + spacer +
+#. button( DELETE, _("Delete") ) + spacer +
+#: src/src/i2p/susi/webmail/WebMail.java:2114
+msgid "Check Mail"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1669
-#: src/src/i2p/susi/webmail/WebMail.java:1748
-msgid "New"
+#. if (Config.hasConfigFile())
+#. out.println(button( RELOAD, _("Reload Config") ) + spacer);
+#: src/src/i2p/susi/webmail/WebMail.java:2117
+msgid "Logout"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1670
-#: src/src/i2p/susi/webmail/WebMail.java:1749
-msgid "Reply"
+#: src/src/i2p/susi/webmail/WebMail.java:2130
+#: src/src/i2p/susi/webmail/WebMail.java:2282
+msgid "Date"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1671
-#: src/src/i2p/susi/webmail/WebMail.java:1750
-msgid "Reply All"
+#: src/src/i2p/susi/webmail/WebMail.java:2133
+msgid "Size"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1672
-#: src/src/i2p/susi/webmail/WebMail.java:1751
-msgid "Forward"
+#: src/src/i2p/susi/webmail/WebMail.java:2173
+msgid "Message is new"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1673
-#: src/src/i2p/susi/webmail/WebMail.java:1752
-msgid "Delete"
+#: src/src/i2p/susi/webmail/WebMail.java:2175
+msgid "Message has an attachment"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1674
-msgid "Check Mail"
+#: src/src/i2p/susi/webmail/WebMail.java:2177
+msgid "Message is spam"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1678
-msgid "Sender"
+#: src/src/i2p/susi/webmail/WebMail.java:2185
+msgid "No messages"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1679
-msgid "Subject"
+#. TODO ngettext
+#: src/src/i2p/susi/webmail/WebMail.java:2197
+msgid "Really delete the marked messages?"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1680
-msgid "Date"
+#: src/src/i2p/susi/webmail/WebMail.java:2198
+msgid "Yes, really delete them!"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1681
-msgid "Size"
+#. TODO js
+#: src/src/i2p/susi/webmail/WebMail.java:2202
+msgid "Delete Selected"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1707
-#, java-format
-msgid "1 Byte"
-msgid_plural "{0} Bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/src/i2p/susi/webmail/WebMail.java:1712
+#: src/src/i2p/susi/webmail/WebMail.java:2204
 msgid "Mark All"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1713
-msgid "Invert Selection"
-msgstr ""
-
-#: src/src/i2p/susi/webmail/WebMail.java:1714
-msgid "Clear"
+#: src/src/i2p/susi/webmail/WebMail.java:2206
+msgid "Clear All"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1717
-#: src/src/i2p/susi/webmail/WebMail.java:1718
+#: src/src/i2p/susi/webmail/WebMail.java:2231
+#: src/src/i2p/susi/webmail/WebMail.java:2232
 msgid "First"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1717
-#: src/src/i2p/susi/webmail/WebMail.java:1718
-#: src/src/i2p/susi/webmail/WebMail.java:1753
+#: src/src/i2p/susi/webmail/WebMail.java:2231
+#: src/src/i2p/susi/webmail/WebMail.java:2232
+#: src/src/i2p/susi/webmail/WebMail.java:2268
 msgid "Previous"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1719
+#: src/src/i2p/susi/webmail/WebMail.java:2234
 #, java-format
 msgid "Page {0} of {1}"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1721
-#: src/src/i2p/susi/webmail/WebMail.java:1722
+#: src/src/i2p/susi/webmail/WebMail.java:2237
+#: src/src/i2p/susi/webmail/WebMail.java:2238
 msgid "Last"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1721
-#: src/src/i2p/susi/webmail/WebMail.java:1722
-#: src/src/i2p/susi/webmail/WebMail.java:1754
+#: src/src/i2p/susi/webmail/WebMail.java:2237
+#: src/src/i2p/susi/webmail/WebMail.java:2238
+#: src/src/i2p/susi/webmail/WebMail.java:2270
 msgid "Next"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1725
-msgid "Pagesize:"
+#: src/src/i2p/susi/webmail/WebMail.java:2250
+msgid "Really delete this message?"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1726
-msgid "Set"
+#: src/src/i2p/susi/webmail/WebMail.java:2250
+msgid "Yes, really delete it!"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1736
-msgid "Really delete this message?"
+#: src/src/i2p/susi/webmail/WebMail.java:2263
+msgid "Reply"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1736
-msgid "Yes, really delete it!"
+#: src/src/i2p/susi/webmail/WebMail.java:2264
+msgid "Reply All"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1755
-msgid "Back to Folder"
+#: src/src/i2p/susi/webmail/WebMail.java:2265
+msgid "Forward"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1762
-msgid "Date:"
+#: src/src/i2p/susi/webmail/WebMail.java:2266
+msgid "Delete"
 msgstr ""
 
-#: src/src/i2p/susi/webmail/WebMail.java:1773
+#: src/src/i2p/susi/webmail/WebMail.java:2269
+msgid "Back to Folder"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2294
 msgid "Could not fetch mail."
 msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2312
+msgid "Folder Page Size"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2315
+msgid "Set"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2318
+msgid "Advanced Configuration"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2329
+msgid "Save Configuration"
+msgstr ""
+
+#. this appears in the UI so translate
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:102
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:747
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:789
+msgid "No response from server"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:664
+msgid "Error connecting to server"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:669
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:672
+msgid "Error opening mailbox"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1021
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
+msgid "Login failed"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:214
+msgid "Cannot connect"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:225
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:237
+msgid "Server refused connection"
+msgstr ""
+
+#. TODO which recipient?
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262
+msgid "Mail rejected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279
+msgid "Error sending mail"
+msgstr ""