diff --git a/view/de/mail_received_eml.tpl b/view/de/mail_received_eml.tpl
index bf9bb9ca9..890b71488 100644
--- a/view/de/mail_received_eml.tpl
+++ b/view/de/mail_received_eml.tpl
@@ -1,47 +1,13 @@
--$mimeboundary
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
-Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.
-
-$title
-
-$textversion
-
-Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu
-beantworten.
-
-Viele Grüße,
-$siteName Administrator
+$textbody
--$mimeboundary
-Content-Type: text/html; charset=utf-8
-Content-Transfer-Encoding: 8bit
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
+
+$htmlbody
-
-
-
- Friendika Nachricht
-
-
-
-
-
- Friendika |
-
- Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten. |
-
-
- |
- $from |
- $title |
- $htmlversion |
- Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu beantworten. |
- | Viele Grüße, |
- | $siteName Administrator |
-
-
-
-
-
--$mimeboundary--
\ No newline at end of file
diff --git a/view/de/mail_received_html_body_eml.tpl b/view/de/mail_received_html_body_eml.tpl
new file mode 100644
index 000000000..b2d914f24
--- /dev/null
+++ b/view/de/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+ Friendika Nachricht
+
+
+
+
+
+ Friendika |
+
+ Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten. |
+
+
+ |
+ $from |
+ $title |
+ $htmlversion |
+ Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu beantworten. |
+ | Viele Grüße, |
+ | $siteName Administrator |
+
+
+
+
diff --git a/view/de/mail_received_text_body_eml.tpl b/view/de/mail_received_text_body_eml.tpl
new file mode 100644
index 000000000..f5c90cfed
--- /dev/null
+++ b/view/de/mail_received_text_body_eml.tpl
@@ -0,0 +1,11 @@
+Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.
+
+$title
+
+$textversion
+
+Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu
+beantworten.
+
+Viele Gr٤e,
+$siteName Administrator
diff --git a/view/en/mail_received_eml.tpl b/view/en/mail_received_eml.tpl
index 802280052..4ba0757cb 100644
--- a/view/en/mail_received_eml.tpl
+++ b/view/en/mail_received_eml.tpl
@@ -1,47 +1,14 @@
--$mimeboundary
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
-$from sent you a new private message at $siteName.
-
-$title
-
-$textversion
-
-Please login at $siteurl to read and reply to your private messages.
-
-Thank you,
-$siteName administrator
+$textbody
--$mimeboundary
-Content-Type: text/html; charset=utf-8
-Content-Transfer-Encoding: 8bit
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
+
+$htmlbody
-
-
-
- Friendika Message
-
-
-
-
-
- Friendika |
-
- $from sent you a new private message at $siteName. |
-
-
- |
- $from |
- $title |
- $htmlversion |
- Please login at $siteurl to read and reply to your private messages. |
- | Thank You, |
- | $siteName Administrator |
-
-
-
-
-
--$mimeboundary--
diff --git a/view/en/mail_received_html_body_eml.tpl b/view/en/mail_received_html_body_eml.tpl
new file mode 100644
index 000000000..981aa46e7
--- /dev/null
+++ b/view/en/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+ Friendika Message
+
+
+
+
+
+ Friendika |
+
+ $from sent you a new private message at $siteName. |
+
+
+ |
+ $from |
+ $title |
+ $htmlversion |
+ Please login at $siteurl to read and reply to your private messages. |
+ | Thank You, |
+ | $siteName Administrator |
+
+
+
+
\ No newline at end of file
diff --git a/view/en/mail_received_text_body_eml.tpl b/view/en/mail_received_text_body_eml.tpl
new file mode 100644
index 000000000..023867304
--- /dev/null
+++ b/view/en/mail_received_text_body_eml.tpl
@@ -0,0 +1,10 @@
+$from sent you a new private message at $siteName.
+
+$title
+
+$textversion
+
+Please login at $siteurl to read and reply to your private messages.
+
+Thank you,
+$siteName administrator
diff --git a/view/fr/mail_received_eml.tpl b/view/fr/mail_received_eml.tpl
index f872a6713..890b71488 100644
--- a/view/fr/mail_received_eml.tpl
+++ b/view/fr/mail_received_eml.tpl
@@ -1,46 +1,13 @@
--$mimeboundary
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
-$from t'a envoyŽ un message ˆ $siteName.
-
-$title
-
-$textversion
-
-Ouvrez une session svp ˆ $siteurl pour lire et rŽpondre ˆ vos messages privŽs.
-
-Merci,
-$siteName Administrateur
+$textbody
--$mimeboundary
-Content-Type: text/html; charset=utf-8
-Content-Transfer-Encoding: 8bit
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
+
+$htmlbody
-
-
-
- Friendika Message
-
-
-
-
-
- Friendika |
-
- $from t'a envoyŽ un message ˆ $siteName. |
-
-
- |
- $from |
- $title |
- $htmlversion |
- Ouvrez une session svp ˆ $siteurl pour lire et rŽpondre ˆ vos messages privŽs. |
- | Merci, |
- | $siteName Administrateur |
-
-
-
-
-
--$mimeboundary--
\ No newline at end of file
diff --git a/view/fr/mail_received_html_body_eml.tpl b/view/fr/mail_received_html_body_eml.tpl
new file mode 100644
index 000000000..43584a4c4
--- /dev/null
+++ b/view/fr/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+ Friendika Message
+
+
+
+
+
+ Friendika |
+
+ $from t'a envoyŽ un message ˆ $siteName. |
+
+
+ |
+ $from |
+ $title |
+ $htmlversion |
+ Ouvrez une session svp ˆ $siteurl pour lire et rŽpondre ˆ vos messages privŽs. |
+ | Merci, |
+ | $siteName Administrateur |
+
+
+
+
diff --git a/view/fr/mail_received_text_body_eml.tpl b/view/fr/mail_received_text_body_eml.tpl
new file mode 100644
index 000000000..c877344e0
--- /dev/null
+++ b/view/fr/mail_received_text_body_eml.tpl
@@ -0,0 +1,10 @@
+$from t'a envoyŽ un message ˆ $siteName.
+
+$title
+
+$textversion
+
+Ouvrez une session svp ˆ $siteurl pour lire et rŽpondre ˆ vos messages privŽs.
+
+Merci,
+$siteName Administrateur
diff --git a/view/it/mail_received_eml.tpl b/view/it/mail_received_eml.tpl
index 829c0fee5..14b983cfe 100644
--- a/view/it/mail_received_eml.tpl
+++ b/view/it/mail_received_eml.tpl
@@ -1,46 +1,13 @@
--$mimeboundary
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
-Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.
-
-$title
-
-$textversion
-
-Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.
-
-Grazie,
-L'amministratore di $siteName
+$textbody
--$mimeboundary
-Content-Type: text/html; charset=utf-8
-Content-Transfer-Encoding: 8bit
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: base64
+
+$htmlbody
-
-
-
- Friendika Messsaggio
-
-
-
-
-
- Friendika |
-
- Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'. |
-
-
- |
- $from |
- $title |
- $htmlversion |
- Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati. |
- | Grazie, |
- | L'amministratore di $siteName |
-
-
-
-
-
---$mimeboundary--
\ No newline at end of file
+--$mimeboundary--
diff --git a/view/it/mail_received_html_body_eml.tpl b/view/it/mail_received_html_body_eml.tpl
new file mode 100644
index 000000000..a3c71cef9
--- /dev/null
+++ b/view/it/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+ Friendika Messsaggio
+
+
+
+
+
+ Friendika |
+
+ Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'. |
+
+
+ |
+ $from |
+ $title |
+ $htmlversion |
+ Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati. |
+ | Grazie, |
+ | L'amministratore di $siteName |
+
+
+
+
diff --git a/view/it/mail_received_text_body_eml.tpl b/view/it/mail_received_text_body_eml.tpl
new file mode 100644
index 000000000..c7da9533f
--- /dev/null
+++ b/view/it/mail_received_text_body_eml.tpl
@@ -0,0 +1,10 @@
+Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.
+
+$title
+
+$textversion
+
+Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.
+
+Grazie,
+L'amministratore di $siteName