diff --git a/.tx/config b/.tx/config
index 0b9727bdce929c264c0418455e4cdd3ff2acda43..3cabd89a7d128774c965ad69535806808302e7b0 100644
--- a/.tx/config
+++ b/.tx/config
@@ -277,6 +277,7 @@ trans.da = apps/susimail/locale/messages_da.po
 trans.de = apps/susimail/locale/messages_de.po
 trans.el = apps/susimail/locale/messages_el.po
 trans.es = apps/susimail/locale/messages_es.po
+trans.fa = apps/susimail/locale/messages_fa.po
 trans.fi = apps/susimail/locale/messages_fi.po
 trans.fr = apps/susimail/locale/messages_fr.po
 trans.gl = apps/susimail/locale/messages_gl.po
diff --git a/apps/susimail/locale/messages_fa.po b/apps/susimail/locale/messages_fa.po
new file mode 100644
index 0000000000000000000000000000000000000000..0eded4e8830588a5c5c0d7a0cf8e86b0f23e8f4e
--- /dev/null
+++ b/apps/susimail/locale/messages_fa.po
@@ -0,0 +1,617 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the susimail package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# NoProfile, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-04-24 14:13+0000\n"
+"PO-Revision-Date: 2019-05-22 14:22+0000\n"
+"Last-Translator: Reza Ghasemi\n"
+"Language-Team: Persian (http://www.transifex.com/otf/I2P/language/fa/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: src/src/i2p/susi/webmail/MailPart.java:321
+#, java-format
+msgid "No encoder found for encoding \\''{0}\\''."
+msgstr ""
+
+#. tagged in WebMail
+#: src/src/i2p/susi/webmail/Sorters.java:90
+#: src/src/i2p/susi/webmail/WebMail.java:1171
+#: src/src/i2p/susi/webmail/WebMail.java:1172
+msgid "Re:"
+msgstr "پاسخ:"
+
+#: src/src/i2p/susi/webmail/Sorters.java:91
+#: src/src/i2p/susi/webmail/WebMail.java:1251
+#: src/src/i2p/susi/webmail/WebMail.java:1252
+msgid "Fwd:"
+msgstr "هدایت:"
+
+#. MailDir-like
+#: src/src/i2p/susi/webmail/WebMail.java:214
+msgid "Drafts"
+msgstr "پیش‌نویس‌ها"
+
+#. MailDir-like
+#: src/src/i2p/susi/webmail/WebMail.java:215
+msgid "Sent"
+msgstr "ارسال شد"
+
+#. MailDir-like
+#: src/src/i2p/susi/webmail/WebMail.java:216
+msgid "Trash"
+msgstr "سطل زباله"
+
+#. MailDir-like
+#: src/src/i2p/susi/webmail/WebMail.java:217
+msgid "Bulk Mail"
+msgstr ""
+
+#. untranslated, translate on use
+#: src/src/i2p/susi/webmail/WebMail.java:221
+msgid "Inbox"
+msgstr "اینباکس"
+
+#: src/src/i2p/susi/webmail/WebMail.java:534
+msgid "unknown"
+msgstr "ناشناخته"
+
+#: src/src/i2p/susi/webmail/WebMail.java:583
+#, java-format
+msgid "Charset \\''{0}\\'' not supported."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:587
+#, java-format
+msgid "Part ({0}) not shown, because of {1}"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:637
+#: src/src/i2p/susi/webmail/WebMail.java:642
+#, java-format
+msgid "Download attachment {0}"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:643
+msgid "File is packed into a zipfile for security reasons."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:648
+#, java-format
+msgid "Attachment ({0})."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:708
+msgid "Need username for authentication."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:712
+msgid "Need password for authentication."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:716
+msgid "Need hostname for connect."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:721
+msgid "Need port number for pop3 connect."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:728
+msgid "POP3 port number is not in range 0..65535."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:734
+msgid "POP3 port number is invalid."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:740
+msgid "Need port number for smtp connect."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:747
+msgid "SMTP port number is not in range 0..65535."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:753
+msgid "SMTP port number is invalid."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:830
+#: src/src/i2p/susi/webmail/WebMail.java:1382
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:446
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:644
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:657
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:716
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:754
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:762
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:243
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:258
+msgid "Cannot connect"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:926
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:744
+msgid "Error connecting to server"
+msgstr ""
+
+#. _t("Internal error, lost connection.") + '\n' +
+#: src/src/i2p/susi/webmail/WebMail.java:970
+#: src/src/i2p/susi/webmail/WebMail.java:984
+msgid "User logged out."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1035
+msgid "Draft saved."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1045
+#: src/src/i2p/susi/webmail/WebMail.java:1286
+#: src/src/i2p/susi/webmail/WebMail.java:2721
+#: src/src/i2p/susi/webmail/WebMail.java:2902
+msgid "Unable to save mail."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1175
+#, java-format
+msgid "On {0} {1} wrote:"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1238
+#: src/src/i2p/susi/webmail/WebMail.java:1465
+#, java-format
+msgid "Error reading uploaded file: {0}"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1264
+msgid "begin forwarded mail"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1274
+msgid "end forwarded mail"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1292
+#: src/src/i2p/susi/webmail/WebMail.java:3467
+msgid "Could not fetch mail body."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1324
+msgid "Message id not valid."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1369
+msgid "Internal error, lost connection."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1462
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:386
+#, java-format
+msgid "No Encoding found for {0}"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1592
+msgid "Attachment not found."
+msgstr ""
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1621
+#: src/src/i2p/susi/webmail/WebMail.java:1623
+#: src/src/i2p/susi/webmail/WebMail.java:2314
+#: src/src/i2p/susi/webmail/WebMail.java:3471
+msgid "Message not found."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1726
+#, java-format
+msgid "1 message deleted."
+msgid_plural "{0} messages deleted."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1728
+#: src/src/i2p/susi/webmail/WebMail.java:1737
+msgid "No messages marked for deletion."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1802
+#, java-format
+msgid "Host unchanged. Edit configation file {0} to change host."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1822
+msgid "Configuration saved"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1844
+msgid "Invalid pagesize number, resetting to default value."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2292
+#: src/src/i2p/susi/webmail/WebMail.java:3107
+msgid "Login"
+msgstr "ورود"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2294
+#: src/src/i2p/susi/webmail/WebMail.java:2420
+#: src/src/i2p/susi/webmail/WebMail.java:3124
+msgid "Loading emails, please wait..."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2302
+#, java-format
+msgid "1 Message"
+msgid_plural "{0} Messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2304
+#: src/src/i2p/susi/webmail/WebMail.java:3244
+msgid "No messages"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2312
+msgid "Show Message"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2317
+msgid "New Message"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2319
+msgid "Configuration"
+msgstr "پیکربندی"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2330
+msgid "Email"
+msgstr "پست الکترونیکی"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2406
+#, java-format
+msgid "{0} new message"
+msgid_plural "{0} new messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2409
+msgid "No new messages"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2422
+msgid "Checking for new emails on server"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2424
+#: src/src/i2p/susi/webmail/WebMail.java:3126
+msgid "Refresh the page for updates"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2629
+#: src/src/i2p/susi/webmail/WebMail.java:3226
+#: src/src/i2p/susi/webmail/WebMail.java:3443
+msgid "no subject"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2757
+msgid "Found no valid sender address."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2763
+#, java-format
+msgid "Found no valid address in \\''{0}\\''."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2777
+msgid "No recipients found."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2791
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:302
+#, java-format
+msgid "Email is too large, max is {0}"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2834
+#: src/src/i2p/susi/webmail/WebMail.java:2915
+msgid "Sending mail."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2839
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:254
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:346
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:351
+msgid "Error sending mail"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2873
+msgid "Mail sent."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2965
+msgid "Send"
+msgstr "ارسال"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2966
+msgid "Save as Draft"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2967
+#: src/src/i2p/susi/webmail/WebMail.java:3258
+#: src/src/i2p/susi/webmail/WebMail.java:3361
+#: src/src/i2p/susi/webmail/WebMail.java:3521
+msgid "Cancel"
+msgstr "لغو کردن"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3054
+#: src/src/i2p/susi/webmail/WebMail.java:3178
+#: src/src/i2p/susi/webmail/WebMail.java:3446
+msgid "From"
+msgstr "از"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3055
+#: src/src/i2p/susi/webmail/WebMail.java:3451
+msgid "To"
+msgstr "به"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3056
+#: src/src/i2p/susi/webmail/WebMail.java:3455
+msgid "Cc"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3057
+msgid "Bcc"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3058
+#: src/src/i2p/susi/webmail/WebMail.java:3179
+#: src/src/i2p/susi/webmail/WebMail.java:3448
+msgid "Subject"
+msgstr "موضوع"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3061
+msgid "Add Attachment"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3067
+msgid "Attachments"
+msgstr "پیوست ها "
+
+#: src/src/i2p/susi/webmail/WebMail.java:3076
+msgid "Delete selected attachments"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3093
+msgid "Email Login"
+msgstr ""
+
+#. current postman hq length limits 16/12, new postman version 32/32
+#: src/src/i2p/susi/webmail/WebMail.java:3095
+msgid "User"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3096
+msgid "Password"
+msgstr "رمز عبور"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3101
+msgid "Host"
+msgstr "ميزبان"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3102
+msgid "POP3 Port"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3103
+msgid "SMTP Port"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3108
+msgid "Read Mail Offline"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3112
+#: src/src/i2p/susi/webmail/WebMail.java:3277
+msgid "Settings"
+msgstr "تنظیمات"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3114
+msgid "Create Account"
+msgstr "ایجاد حساب کاربری"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3114
+msgid "Learn about I2P mail"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3139
+#: src/src/i2p/susi/webmail/WebMail.java:3385
+msgid "New"
+msgstr "جدید"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3149
+msgid "Check Mail"
+msgstr ""
+
+#. if (Config.hasConfigFile())
+#. out.println(button( RELOAD, _t("Reload Config") ) + spacer);
+#: src/src/i2p/susi/webmail/WebMail.java:3159
+#: src/src/i2p/susi/webmail/WebMail.java:3397
+#: src/src/i2p/susi/webmail/WebMail.java:3523
+msgid "Logout"
+msgstr "خروج"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3177
+msgid "Mark for deletion"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3180
+#: src/src/i2p/susi/webmail/WebMail.java:3458
+msgid "Date"
+msgstr "تاریخ"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3183
+msgid "Size"
+msgstr "اندازه"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3231
+msgid "Message is new"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3234
+msgid "Message has an attachment"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3236
+msgid "Message is spam"
+msgstr ""
+
+#. TODO ngettext
+#: src/src/i2p/susi/webmail/WebMail.java:3256
+msgid "Really delete the marked messages?"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3257
+msgid "Yes, really delete them!"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3260
+msgid "Delete Selected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3262
+msgid "Mark All"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3264
+msgid "Clear All"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3289
+msgid "Folder"
+msgstr ""
+
+#. TODO css to center it
+#: src/src/i2p/susi/webmail/WebMail.java:3290
+msgid "Change to Folder"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3296
+msgid "First"
+msgstr "اولین"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3297
+#: src/src/i2p/susi/webmail/WebMail.java:3409
+msgid "Previous"
+msgstr "قبلی"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3306
+#, java-format
+msgid "Page {0} of {1}"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3308
+#: src/src/i2p/susi/webmail/WebMail.java:3424
+msgid "Next"
+msgstr "بعدی"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3309
+msgid "Last"
+msgstr "آخرین"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3359
+msgid "Really delete this message?"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3360
+msgid "Yes, really delete it!"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3388
+msgid "Reply"
+msgstr "پاسخ"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3389
+msgid "Reply All"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3390
+msgid "Forward"
+msgstr "به سمت جلو"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3391
+msgid "Save As"
+msgstr "Save As"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3393
+#: src/src/i2p/susi/webmail/WebMail.java:3395
+msgid "Delete"
+msgstr "پاک کردن"
+
+#. can't move unless has body
+#. can't move from drafts
+#: src/src/i2p/susi/webmail/WebMail.java:3401
+msgid "Move to Folder"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3421
+msgid "Back to Folder"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3504
+msgid "Folder Page Size"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3507
+msgid "Set"
+msgstr "تنظیم"
+
+#: src/src/i2p/susi/webmail/WebMail.java:3510
+msgid "Advanced Configuration"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:3520
+msgid "Save Configuration"
+msgstr ""
+
+#. this appears in the UI so translate
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:108
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:644
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:754
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:936
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:978
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1199
+msgid "No response from server"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:747
+msgid "Mail server login failed, wrong username or password."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:749
+msgid "Logout and then login again with the correct username and password."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1238
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1240
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:314
+msgid "Login failed"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:256
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:285
+msgid "Server refused connection"
+msgstr ""
+
+#. TODO which recipient?
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:327
+msgid "Mail rejected"
+msgstr ""