diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index 10814cd3208c86dd9415acc3ad0fbf1a441b258d..c5326e8d7d2db9beff51ef4cffb24ed8a07045de 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -1,20 +1,19 @@
-<?php
+<?php
 $wb['301'] = 'Modul für Benutzer nicht erlaubt.';
-$wb['302'] = 'Modul ungültig.';
-$wb['1001'] = 'Der Benutzername und das Passwort dürfen nicht leer sein!';
-$wb['1002'] = 'Der Benutzername und/oder das Passwort sind nicht korrekt!';
-$wb['1003'] = 'Der Benutzername ist deaktiviert!';
-$wb['delete_confirmation'] = 'Wollen Sie den Datensatz wirklich löschen?';
-$wb['error_no_view_permission'] = 'Sie haben nicht die Berechtigung, den Datensatz zu lesen, oder der Datensatz existiert nicht!';
-$wb['error_no_delete_permission'] = 'Sie haben nicht die Berechtigung, den Datensatz zu löschen!';
-$wb['page_txt'] = 'Seite';
-$wb['page_of_txt'] = 'von';
-$wb['page_next_txt'] = 'Weiter';
-$wb['page_back_txt'] = 'Zurück';
-$wb['delete_txt'] = 'Löschen';
-$wb['filter_txt'] = 'Filter';
-$wb['add_new_record_txt'] = 'Neuen Datensatz hinzufügen';
-$wb['btn_save_txt'] = 'Speichern';
-$wb['btn_cancel_txt'] = 'Abbrechen';
-?>
-
+$wb['302'] = 'Modul ungültig.';
+$wb['1001'] = 'Der Benutzername und das Passwort dürfen nicht leer sein!';
+$wb['1002'] = 'Der Benutzername und/oder das Passwort sind nicht korrekt!';
+$wb['1003'] = 'Der Benutzername ist deaktiviert!';
+$wb['delete_confirmation'] = 'Wollen Sie den Datensatz wirklich löschen?';
+$wb['error_no_view_permission'] = 'Sie haben nicht die Berechtigung, den Datensatz zu lesen, oder der Datensatz existiert nicht!';
+$wb['error_no_delete_permission'] = 'Sie haben nicht die Berechtigung, den Datensatz zu löschen!';
+$wb['page_txt'] = 'Seite';
+$wb['page_of_txt'] = 'von';
+$wb['page_next_txt'] = 'Weiter';
+$wb['page_back_txt'] = 'Zurück';
+$wb['delete_txt'] = 'Löschen';
+$wb['filter_txt'] = 'Filter';
+$wb['add_new_record_txt'] = 'Neuen Datensatz hinzufügen';
+$wb['btn_save_txt'] = 'Speichern';
+$wb['btn_cancel_txt'] = 'Abbrechen';
+?>
diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng
index 5d3a0dc5146480f24f834c110fc313df2d8ff698..969c373dc8053b36958ae3250fc971f33b590b0b 100755
--- a/interface/lib/lang/fi.lng
+++ b/interface/lib/lang/fi.lng
@@ -17,4 +17,3 @@ $wb['add_new_record_txt'] = 'Lisää uusi tietue';
 $wb['btn_save_txt'] = 'Tallenna';
 $wb['btn_cancel_txt'] = 'Keskeytä';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi.lng b/interface/web/admin/lib/lang/fi.lng
index aa4abbaf2ba406d44953d1ac018e0b961a5667ca..0f21a5a536a133218dff33641295e6be55ca3df6 100755
--- a/interface/web/admin/lib/lang/fi.lng
+++ b/interface/web/admin/lib/lang/fi.lng
@@ -32,4 +32,3 @@ $wb['Language Editor'] = 'Kielimuokkain';
 $wb['Software'] = 'Ohjelmat';
 $wb['Repositories'] = 'Ohjelmapakettien varastot';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_firewall.lng b/interface/web/admin/lib/lang/fi_firewall.lng
index e2f7771768c00fef5b940cd6c760e6bca9748926..d47d21de030c3f9951f9c4427e02843b10204e9c 100755
--- a/interface/web/admin/lib/lang/fi_firewall.lng
+++ b/interface/web/admin/lib/lang/fi_firewall.lng
@@ -7,4 +7,3 @@ $wb['udp_port_help_txt'] = 'Pilkulla erotettu lista';
 $wb['active_txt'] = 'Käytössä';
 $wb['firewall_error_unique'] = 'Tällainen palomuurisäänto on jo tällä palvelimella.';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_firewall_list.lng b/interface/web/admin/lib/lang/fi_firewall_list.lng
index e912ff05a5fd31aae1c8676f9fcbb7aeb7142cc5..96ff2dc63abeeff38ecbcf3d77e69a573b7f844f 100755
--- a/interface/web/admin/lib/lang/fi_firewall_list.lng
+++ b/interface/web/admin/lib/lang/fi_firewall_list.lng
@@ -6,4 +6,3 @@ $wb['tcp_port_txt'] = 'Avoimet TCP-portit';
 $wb['udp_port_txt'] = 'Avoimet UDP-portit';
 $wb['add_new_record_txt'] = 'Lisää uusi palomuurisääntö';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_groups.lng b/interface/web/admin/lib/lang/fi_groups.lng
index c3341ed25f955408c97ebf8c8c92bb4b9e3872b4..141322bc008274184c4a4ff894720421bd73222f 100755
--- a/interface/web/admin/lib/lang/fi_groups.lng
+++ b/interface/web/admin/lib/lang/fi_groups.lng
@@ -3,4 +3,3 @@ $wb['description_txt'] = 'Ryhmän kuvaus';
 $wb['name_txt'] = 'Käyttäjäryhmä';
 $wb['name_err'] = 'Käyttäjäryhmän nimen on oltava vähintään 1, enintään 30 merkkiä pitkä.';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_groups_list.lng b/interface/web/admin/lib/lang/fi_groups_list.lng
index b7cd54561212e86c1733f0aaac4da364f976ded1..8a7b0e4f834865d2504bd3ad98ed0f22849fa2d4 100755
--- a/interface/web/admin/lib/lang/fi_groups_list.lng
+++ b/interface/web/admin/lib/lang/fi_groups_list.lng
@@ -4,4 +4,3 @@ $wb['description_txt'] = 'Ryhmien kuvaukset';
 $wb['name_txt'] = 'Käyttäjäryhmä';
 $wb['add_new_record_txt'] = 'Lisää uusi tietue';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_language_add.lng b/interface/web/admin/lib/lang/fi_language_add.lng
index 5432e1d4a0ca5fc9a4ba929f1afe490563254c46..c58d9ea44fb4e5a18c132b241bb1ed0005730914 100755
--- a/interface/web/admin/lib/lang/fi_language_add.lng
+++ b/interface/web/admin/lib/lang/fi_language_add.lng
@@ -5,4 +5,3 @@ $wb['language_new_txt'] = 'Lisää uusi kieli';
 $wb['btn_save_txt'] = 'Luo uudet kielitiedostot';
 $wb['btn_cancel_txt'] = 'Keskeytä';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_language_complete.lng b/interface/web/admin/lib/lang/fi_language_complete.lng
index 758357f4dd7a5110e2f283ff2c75f50a34b82ffa..f4baae36a5dd78f3584f72c98e8f9bc7e824b3a8 100755
--- a/interface/web/admin/lib/lang/fi_language_complete.lng
+++ b/interface/web/admin/lib/lang/fi_language_complete.lng
@@ -4,4 +4,3 @@ $wb['language_select_txt'] = 'Valitse täydennettävä kieli';
 $wb['btn_save_txt'] = 'Yhdistä kielitiedostot nyt';
 $wb['btn_cancel_txt'] = 'Keskeytä';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_language_edit.lng b/interface/web/admin/lib/lang/fi_language_edit.lng
index f3fbfdedc05539980ae8b6b13895d9b6388d34ba..cdf73da643afb563ff1d2df34cd530399e75f285 100755
--- a/interface/web/admin/lib/lang/fi_language_edit.lng
+++ b/interface/web/admin/lib/lang/fi_language_edit.lng
@@ -6,4 +6,3 @@ $wb['lang_file_txt'] = 'Kielitiedosto';
 $wb['btn_save_txt'] = 'Tallenna';
 $wb['btn_cancel_txt'] = 'Keskeytä';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_language_export.lng b/interface/web/admin/lib/lang/fi_language_export.lng
index db057cbd4c0fbd9f6ad8a98dd6b166b232fd03c2..b1ff06c4e8c96719efa699677a3a1747df7c5a3f 100755
--- a/interface/web/admin/lib/lang/fi_language_export.lng
+++ b/interface/web/admin/lib/lang/fi_language_export.lng
@@ -4,4 +4,3 @@ $wb['language_select_txt'] = 'Valitse ladattava kieli';
 $wb['btn_save_txt'] = 'Lataa valittu kielitiedosto';
 $wb['btn_cancel_txt'] = 'Takaisin';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_language_import.lng b/interface/web/admin/lib/lang/fi_language_import.lng
index ef3d8aa639795f02896e27141f60a9fe00faf8b6..ee8a32f856e4f501df06a1d8b153be44bcd93f34 100755
--- a/interface/web/admin/lib/lang/fi_language_import.lng
+++ b/interface/web/admin/lib/lang/fi_language_import.lng
@@ -5,4 +5,3 @@ $wb['btn_save_txt'] = 'Asenna valittu kielitiedosto';
 $wb['language_overwrite_txt'] = 'Ylikirjoitetaan tiedostot, jos ne on jo olemassa.';
 $wb['btn_cancel_txt'] = 'Takaisin';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_language_list.lng b/interface/web/admin/lib/lang/fi_language_list.lng
index 8dd1d59f72d5e89d9377df5a941f22c2c8f800a8..85e7b70e11c9313e5fbf5b6f0ac0e129955a22a7 100755
--- a/interface/web/admin/lib/lang/fi_language_list.lng
+++ b/interface/web/admin/lib/lang/fi_language_list.lng
@@ -5,4 +5,3 @@ $wb['module_txt'] = 'Ohjelmaosio';
 $wb['lang_file_txt'] = 'Kielitiedosto';
 $wb['lang_file_date_txt'] = 'Viimeksi muokattu';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_server.lng b/interface/web/admin/lib/lang/fi_server.lng
index da70cba12a1966a16200ffddacb5cc1c7916acb6..8d2fec13b860498b0bc2a274e10dd296132b9f62 100755
--- a/interface/web/admin/lib/lang/fi_server.lng
+++ b/interface/web/admin/lib/lang/fi_server.lng
@@ -9,4 +9,3 @@ $wb['db_server_txt'] = 'Tietokantapalvelin';
 $wb['vserver_server_txt'] = 'Virtuaalipalvelin';
 $wb['active_txt'] = 'Käytössä';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index 5d4672259690210ef7e3ed8f6e0db547b234bdce..a93588643510288ff14c4be1d6e5394d5329c84d 100755
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -33,4 +33,3 @@ $wb['hostname_txt'] = 'Palvelimen nimi';
 $wb['nameservers_txt'] = 'Nimipalvelimet';
 $wb['auto_network_configuration_txt'] = 'Automaattiset verkkoasetukset';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_server_config_list.lng b/interface/web/admin/lib/lang/fi_server_config_list.lng
index fde21a1c32a669eb904f0a9ba0cc86af9b23beb1..ed1cbed5b4656b7c01b16da5a778052d71c026c5 100755
--- a/interface/web/admin/lib/lang/fi_server_config_list.lng
+++ b/interface/web/admin/lib/lang/fi_server_config_list.lng
@@ -2,4 +2,3 @@
 $wb['list_head_txt'] = 'Palvelimen asetukset';
 $wb['server_name_txt'] = 'Palvelin';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_server_ip.lng b/interface/web/admin/lib/lang/fi_server_ip.lng
index e423a99aa828f07bfd45050a4a060b820db3cfa3..79304332530ede603756089d4db6db2b9267d40a 100755
--- a/interface/web/admin/lib/lang/fi_server_ip.lng
+++ b/interface/web/admin/lib/lang/fi_server_ip.lng
@@ -4,4 +4,3 @@ $wb['ip_address_txt'] = 'IP-osoite';
 $wb['virtualhost_txt'] = 'Virtuaalipalvelin';
 $wb['ip_err'] = 'IP-osoite vääränlainen';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_server_ip_list.lng b/interface/web/admin/lib/lang/fi_server_ip_list.lng
index 8123436482befdff8adeb82aaeb031847edee891..a297a62bf6c56094f43f4bf0a1c28ea4499fb1ab 100755
--- a/interface/web/admin/lib/lang/fi_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/fi_server_ip_list.lng
@@ -4,4 +4,3 @@ $wb['server_id_txt'] = 'Palvelin';
 $wb['ip_address_txt'] = 'IP-osoite';
 $wb['add_new_record_txt'] = 'Lisää uusi IP-osoite';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_server_list.lng b/interface/web/admin/lib/lang/fi_server_list.lng
index c303c47dd3a870ca08ab0bcd9c9b15c04068c474..30863bdf247d2e0ad51acdee2b6f4dd8cbada2f9 100755
--- a/interface/web/admin/lib/lang/fi_server_list.lng
+++ b/interface/web/admin/lib/lang/fi_server_list.lng
@@ -9,4 +9,3 @@ $wb['db_server_txt'] = 'Tietokantapalvelin';
 $wb['vserver_server_txt'] = 'Virtuaalipalvelin';
 $wb['add_new_record_txt'] = 'Lisää uusi tietue';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_software_package_list.lng b/interface/web/admin/lib/lang/fi_software_package_list.lng
index 97f481e864e567c5e9d6273e0831413b005d2e85..a8957cc9f772dc4cf032283a37f7dca3c9e837a2 100755
--- a/interface/web/admin/lib/lang/fi_software_package_list.lng
+++ b/interface/web/admin/lib/lang/fi_software_package_list.lng
@@ -5,4 +5,3 @@ $wb['package_title_txt'] = 'Ohjelmapaketti';
 $wb['package_description_txt'] = 'Ohjelmapaketin kuvaus';
 $wb['action_txt'] = 'Toiminto';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_software_repo.lng b/interface/web/admin/lib/lang/fi_software_repo.lng
index 9a9ebead630c584327439195b018d2d2193f53ce..c89969445fe5bfdddf0369b72c1934b578b0b7f8 100755
--- a/interface/web/admin/lib/lang/fi_software_repo.lng
+++ b/interface/web/admin/lib/lang/fi_software_repo.lng
@@ -5,4 +5,3 @@ $wb['repo_username_txt'] = 'Käyttäjätunnus (valinnainen)';
 $wb['repo_password_txt'] = 'Salasana (valinnnainen)';
 $wb['active_txt'] = 'Käytössä';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_software_repo_list.lng b/interface/web/admin/lib/lang/fi_software_repo_list.lng
index 094fc4f91c56663ad09b0dd7a0bb430c4b94a306..bde844c99f8d8ea61c5e7b4b1dd98c831ae57a92 100755
--- a/interface/web/admin/lib/lang/fi_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/fi_software_repo_list.lng
@@ -4,4 +4,3 @@ $wb['active_txt'] = 'Käytössä';
 $wb['repo_name_txt'] = 'Ohjelmapakettien varasto';
 $wb['repo_url_txt'] = 'Ohjelmapakettien varaston osoite';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_software_update_list.lng b/interface/web/admin/lib/lang/fi_software_update_list.lng
index fcb82879fe2455672f362d57aa7cb6445b01b8b7..c352c1c5c6e2e86808462f5961162319ee4d3ccc 100755
--- a/interface/web/admin/lib/lang/fi_software_update_list.lng
+++ b/interface/web/admin/lib/lang/fi_software_update_list.lng
@@ -5,4 +5,3 @@ $wb['update_title_txt'] = 'Päivitä';
 $wb['version_txt'] = 'Versio';
 $wb['action_txt'] = 'Toiminto';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng
index ff42ab90dd79acb108d16abcf56ad215483d9df6..3ad68041b196924ed546e4a0f97b46a3e0fc5ecd 100755
--- a/interface/web/admin/lib/lang/fi_system_config.lng
+++ b/interface/web/admin/lib/lang/fi_system_config.lng
@@ -11,4 +11,3 @@ $wb['shelluser_prefix_error_regex'] = 'Shell-käyttäjätunnuksen etuliite on v
 $wb['dblist_phpmyadmin_link_txt'] = 'Linkki phpMyAdminiin tietokantalistassa';
 $wb['mailboxlist_webmail_link_txt'] = 'Linkki internetpostiin postilaatikkolistassa';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_users.lng b/interface/web/admin/lib/lang/fi_users.lng
index ec94e5d18e81dbdf33bff3367f9619b2dac49b0c..08bada0374e099ca3ce9d5b5a8e7728781ec0a5b 100755
--- a/interface/web/admin/lib/lang/fi_users.lng
+++ b/interface/web/admin/lib/lang/fi_users.lng
@@ -26,4 +26,3 @@ $wb['default_group_txt'] = 'Oletusryhmä';
 $wb['startmodule_err'] = 'Aloitusosio ei ole sallittu.';
 $wb['password_strength_txt'] = 'Salasanan vahvuus';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fi_users_list.lng b/interface/web/admin/lib/lang/fi_users_list.lng
index 3ed6a42d8f1b793aca7a0042664f89131da1b796..d161aa22d17909b9e9cba152bc4e0d58296e4cc1 100755
--- a/interface/web/admin/lib/lang/fi_users_list.lng
+++ b/interface/web/admin/lib/lang/fi_users_list.lng
@@ -5,4 +5,3 @@ $wb['name_txt'] = 'Etunimi';
 $wb['vorname_txt'] = 'Sukunimi';
 $wb['ort_txt'] = 'Kaupunki';
 ?>
-
diff --git a/interface/web/client/lib/lang/fi.lng b/interface/web/client/lib/lang/fi.lng
index 035b4731c17489abd14f9f7f1c8d51b2a9ed06ab..a06bfe8dfa36c4f8dcb1cb1a39014dbe7cb6c1ca 100755
--- a/interface/web/client/lib/lang/fi.lng
+++ b/interface/web/client/lib/lang/fi.lng
@@ -7,4 +7,3 @@ $wb['Edit Client'] = 'Muokkaa asiakkaan tietoja';
 $wb['Clients'] = 'Asiakkaat';
 $wb['Edit Client-Templates'] = 'Muokkaa asiakasmalleja';
 ?>
-
diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng
index 37037a2eb0bff445ddf17041558025cb0a198187..850d9c32795d05926ecdc6852599a92393631a85 100755
--- a/interface/web/client/lib/lang/fi_client.lng
+++ b/interface/web/client/lib/lang/fi_client.lng
@@ -79,4 +79,3 @@ $wb['password_strength_txt'] = 'Salasanan vahvuus';
 $wb['template_master_txt'] = 'Perusmalli';
 $wb['template_additional_txt'] = 'Lisämalli';
 ?>
-
diff --git a/interface/web/client/lib/lang/fi_client_template.lng b/interface/web/client/lib/lang/fi_client_template.lng
index a501f67f6ca44229f211dd0fd26f8f860e9983ac..31390499d60a5da83cd7386d694d096a395a1f04 100755
--- a/interface/web/client/lib/lang/fi_client_template.lng
+++ b/interface/web/client/lib/lang/fi_client_template.lng
@@ -45,4 +45,3 @@ $wb['limit_dns_zone_error_notint'] = 'DNS-tietueiden raja-arvon pitää olla num
 $wb['limit_database_error_notint'] = 'Tietokantojen raja-arvon pitää olla numero.';
 $wb['error_template_name_empty'] = 'Anna mallilomakkeen nimi';
 ?>
-
diff --git a/interface/web/client/lib/lang/fi_client_template_list.lng b/interface/web/client/lib/lang/fi_client_template_list.lng
index 22b49a61236a4f5838cbfee776afe08a7fe31b7d..094c3c70c93600556fa834ac9744ca59cd82e7ed 100755
--- a/interface/web/client/lib/lang/fi_client_template_list.lng
+++ b/interface/web/client/lib/lang/fi_client_template_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Asiakasmallit';
 $wb['template_type_txt'] = 'Tyyppi';
 $wb['template_name_txt'] = 'Asiakasmallin nimi';
 ?>
-
diff --git a/interface/web/client/lib/lang/fi_clients_list.lng b/interface/web/client/lib/lang/fi_clients_list.lng
index 789b8431435415df1403991a452bfaa10bbc56e7..3d6766dfb5f96a6624f8a08fd3bd0cd0f82e655a 100755
--- a/interface/web/client/lib/lang/fi_clients_list.lng
+++ b/interface/web/client/lib/lang/fi_clients_list.lng
@@ -6,4 +6,3 @@ $wb['city_txt'] = 'Kaupunki';
 $wb['country_txt'] = 'Maa';
 $wb['client_id_txt'] = 'Tunnus';
 ?>
-
diff --git a/interface/web/designer/lib/lang/fi.lng b/interface/web/designer/lib/lang/fi.lng
index 29f4a51efebb370aeb04c5144a604ca2c04e02be..acb6c3546c6150b4edbafb782d3ed85c499210b5 100755
--- a/interface/web/designer/lib/lang/fi.lng
+++ b/interface/web/designer/lib/lang/fi.lng
@@ -1,3 +1,2 @@
 <?php
 ?>
-
diff --git a/interface/web/designer/lib/lang/fi_form_edit.lng b/interface/web/designer/lib/lang/fi_form_edit.lng
index 3af85556a8524a990d905b3b7ed7523d57fcab78..c9a13038a4823d3ab77e498fcd30b8b8c207a289 100755
--- a/interface/web/designer/lib/lang/fi_form_edit.lng
+++ b/interface/web/designer/lib/lang/fi_form_edit.lng
@@ -22,4 +22,3 @@ $wb['auth_preset_perm_user_txt'] = 'Käyttäjän oikeudet';
 $wb['auth_preset_perm_group_txt'] = 'Ryhmän oikeudet';
 $wb['auth_preset_perm_other_txt'] = 'Muiden käyttäjien oikeudet';
 ?>
-
diff --git a/interface/web/designer/lib/lang/fi_form_list.lng b/interface/web/designer/lib/lang/fi_form_list.lng
index a35c8dbcc266459b834796e30822168c79f865d8..9052c8f0c9df08704dbe523cb814417fde52e72f 100755
--- a/interface/web/designer/lib/lang/fi_form_list.lng
+++ b/interface/web/designer/lib/lang/fi_form_list.lng
@@ -5,4 +5,3 @@ $wb['module_txt'] = 'Ohjelmaosio';
 $wb['title_txt'] = 'Otsikko';
 $wb['description_txt'] = 'Kuvaus';
 ?>
-
diff --git a/interface/web/designer/lib/lang/fi_form_show.lng b/interface/web/designer/lib/lang/fi_form_show.lng
index c2f28353a9568d5f6e071142a5b4e0183b8d790f..247a95be59142ae9fb6b753a051489050dbe072e 100755
--- a/interface/web/designer/lib/lang/fi_form_show.lng
+++ b/interface/web/designer/lib/lang/fi_form_show.lng
@@ -16,4 +16,3 @@ $wb['module_del_txt'] = 'Poista ohjelmaosion kansio ja kaikki sen alikansiot?';
 $wb['menu_del_txt'] = 'Poista valikko ja kaikki sen osat?';
 $wb['item_del_txt'] = 'Poista valikon osa?';
 ?>
-
diff --git a/interface/web/designer/lib/lang/fi_module_edit.lng b/interface/web/designer/lib/lang/fi_module_edit.lng
index c902b7a1e305ca8c0588b9ab416895036dab804f..8bb4a5c09e01eee3acf7929732d100d337b121d8 100755
--- a/interface/web/designer/lib/lang/fi_module_edit.lng
+++ b/interface/web/designer/lib/lang/fi_module_edit.lng
@@ -20,4 +20,3 @@ $wb['description_txt'] = '
 <b>Vihje:</b> Kaikki polut ovat suhteellisia web-kansioon, eivät absoluuttisia.
 ';
 ?>
-
diff --git a/interface/web/designer/lib/lang/fi_module_list.lng b/interface/web/designer/lib/lang/fi_module_list.lng
index bb83c342f1c4f28f796ca33018f39ce52b5c88b6..f07c9a377bd2fc6807478f1579497f43fdf6c789 100755
--- a/interface/web/designer/lib/lang/fi_module_list.lng
+++ b/interface/web/designer/lib/lang/fi_module_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Perusohjelmaosio';
 $wb['module_txt'] = 'Ohjelmaosio';
 $wb['title_txt'] = 'Otsikko';
 ?>
-
diff --git a/interface/web/designer/lib/lang/fi_module_nav_item_edit.lng b/interface/web/designer/lib/lang/fi_module_nav_item_edit.lng
index ece2a168bfffb80ba2f3813abe395953fc902101..5f32d5848145dbb98e8f4dbdf0e07d9cac896b37 100755
--- a/interface/web/designer/lib/lang/fi_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/fi_module_nav_item_edit.lng
@@ -6,4 +6,3 @@ $wb['header_txt'] = 'Valikon ominaisuudet';
 $wb['save_txt'] = 'Tallenna';
 $wb['cancel_txt'] = 'Keskeytä';
 ?>
-
diff --git a/interface/web/designer/lib/lang/fi_module_show.lng b/interface/web/designer/lib/lang/fi_module_show.lng
index 2ea910e535c41a589a650da4a6d85aaf59928c7e..066d92f583925a1c0c59aea57ae91e1014b22992 100755
--- a/interface/web/designer/lib/lang/fi_module_show.lng
+++ b/interface/web/designer/lib/lang/fi_module_show.lng
@@ -14,4 +14,3 @@ $wb['module_del_txt'] = 'Haluatko poistaa tämän ohjelmaosion ja kaikki siihen
 $wb['menu_del_txt'] = 'Haluatko poistaa tämän valikon?';
 $wb['item_del_txt'] = 'Haluatko poistaa tämän osan?';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi.lng b/interface/web/dns/lib/lang/fi.lng
index 31bdc48074b41e80711016622334f6d547465280..a44ed083b8e40f419cceef9488c4c1de6013aa7f 100755
--- a/interface/web/dns/lib/lang/fi.lng
+++ b/interface/web/dns/lib/lang/fi.lng
@@ -15,4 +15,3 @@ $wb['DNS SRV'] = 'DNS SRV-tietue';
 $wb['DNS TXT Record'] = 'DNS TXT-tietue';
 $wb['DNS TXT'] = 'DNS TXT-tietue';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_a.lng b/interface/web/dns/lib/lang/fi_dns_a.lng
index 40c6681f955e9c83886c3e620737dca6bd98d1e1..0248631d35f8cddce2200ed68ebc524995125744 100755
--- a/interface/web/dns/lib/lang/fi_dns_a.lng
+++ b/interface/web/dns/lib/lang/fi_dns_a.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Verkkotunnus on vääränlainen.';
 $wb['data_error_empty'] = 'IP-osoite tyhjä';
 $wb['data_error_regex'] = 'IP-osoite on vääränlainen';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_a_list.lng b/interface/web/dns/lib/lang/fi_dns_a_list.lng
index b304f11b8d3a065ffc92d4eb1e716f09ce0c2f7d..0e518ace54bf93cece33c71df119f00317f68189 100755
--- a/interface/web/dns/lib/lang/fi_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/fi_dns_a_list.lng
@@ -9,4 +9,3 @@ $wb['type_txt'] = 'Tyyppi';
 $wb['add_new_record_txt'] = 'Lisää uusi tietue';
 $wb['aux_txt'] = 'Tärkeysjärjestys';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_alias.lng b/interface/web/dns/lib/lang/fi_dns_alias.lng
index d3ccbb045f878dfade32dd8d6d7188d9f7213619..20da599c72e46cc81013cab4fa9f24611c7542b4 100755
--- a/interface/web/dns/lib/lang/fi_dns_alias.lng
+++ b/interface/web/dns/lib/lang/fi_dns_alias.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Aliasverkkotunnus on vääränlainen.';
 $wb['data_error_empty'] = 'Pääverkkotunnus on tyhjä';
 $wb['data_error_regex'] = 'Pääverkkotunnus on vääränlainen';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_cname.lng b/interface/web/dns/lib/lang/fi_dns_cname.lng
index c21cdb25ba293a5a4644a39aea21a5914f9983fd..a58f0d2f2cf1ef58839ec6dc57b83007f194f9c8 100755
--- a/interface/web/dns/lib/lang/fi_dns_cname.lng
+++ b/interface/web/dns/lib/lang/fi_dns_cname.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Verkkotunnus on vääränlainen.';
 $wb['data_error_empty'] = 'Kohteen verkkotunnus on tyhjä';
 $wb['data_error_regex'] = 'Kohteen verkkotunnus on vääränlainen';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_hinfo.lng b/interface/web/dns/lib/lang/fi_dns_hinfo.lng
index baba09e908437debd01cad788ccc727722f7552e..ea2fb93a39c6aad638f6af52d593d32220d71f4e 100755
--- a/interface/web/dns/lib/lang/fi_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/fi_dns_hinfo.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Verkkotunnus on vääränlainen.';
 $wb['data_error_empty'] = 'Verkkotunnuksen tiedot ovat tyhjiä';
 $wb['data_error_regex'] = 'Verkkotunnuksen tiedot ovat vääränlaisia';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_mx.lng b/interface/web/dns/lib/lang/fi_dns_mx.lng
index dba4363664219da122629d252298ca582ef261f8..e4b4a60d56741f7b40c09f324705df47944cb1e8 100755
--- a/interface/web/dns/lib/lang/fi_dns_mx.lng
+++ b/interface/web/dns/lib/lang/fi_dns_mx.lng
@@ -14,4 +14,3 @@ $wb['name_error_regex'] = 'Verkkotunnus on väärän muotoinen.';
 $wb['data_error_empty'] = 'Tekstikenttä on tyhjä';
 $wb['data_error_regex'] = 'Tekstikenttä on vääränlainen';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_ns.lng b/interface/web/dns/lib/lang/fi_dns_ns.lng
index 2ef717cb0c0e0a60dff846b86f65002596de07e6..8f97c53cb27dfcd9306e6b4b776b09dd57d82520 100755
--- a/interface/web/dns/lib/lang/fi_dns_ns.lng
+++ b/interface/web/dns/lib/lang/fi_dns_ns.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Alue-kenttä on väärän muotoinen.';
 $wb['data_error_empty'] = 'Nimipalvelin-kenttä tyhjä';
 $wb['data_error_regex'] = 'Nimipalvelin-kenttän muoto vääränlainen';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_ptr.lng b/interface/web/dns/lib/lang/fi_dns_ptr.lng
index 4cfcb293204bff021c41103dbfc18636de413120..9885c2be9d8619af40ed6c4bcd2844448f7f5f4e 100755
--- a/interface/web/dns/lib/lang/fi_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/fi_dns_ptr.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Alueen nimi-kenttä on väärän muotoinen.';
 $wb['data_error_empty'] = 'Kohteen isäntänimi tyhjä';
 $wb['data_error_regex'] = 'Kohteen isäntänimi muoto vääränlainen';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_rp.lng b/interface/web/dns/lib/lang/fi_dns_rp.lng
index 0c12013b3cb1ae032ff99f5b181e9cd63b6a3692..d47cdcfbdd063ea29c11a0ddd0fa76cf34f01c74 100755
--- a/interface/web/dns/lib/lang/fi_dns_rp.lng
+++ b/interface/web/dns/lib/lang/fi_dns_rp.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Pääverkkotunnus on vääränlainen.';
 $wb['data_error_empty'] = 'Vastuuhenkilö-kenttä tyhjä';
 $wb['data_error_regex'] = 'Vastuuhenkilö-kenttä on vääränlainen';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_soa.lng b/interface/web/dns/lib/lang/fi_dns_soa.lng
index 9f4d4877eafcc8525698122fb50bd609901b7434..809454ab4f86a274c6de8ce3bb7701d7e428a780 100755
--- a/interface/web/dns/lib/lang/fi_dns_soa.lng
+++ b/interface/web/dns/lib/lang/fi_dns_soa.lng
@@ -22,4 +22,3 @@ $wb['ns_error_regex'] = 'Nimipalvelin-kenttä on tyhjä.';
 $wb['mbox_error_empty'] = 'Sähköpostiosoite on tyhjä.';
 $wb['mbox_error_regex'] = 'Sähköpostiosoite on vääränlainen';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_soa_list.lng b/interface/web/dns/lib/lang/fi_dns_soa_list.lng
index 7b405212e630fbac75bf1445adb58c50f9445549..95d104443ad6411eef09abe2340ad9a1adf56d12 100755
--- a/interface/web/dns/lib/lang/fi_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/fi_dns_soa_list.lng
@@ -7,4 +7,3 @@ $wb['ns_txt'] = 'nimipalvelin (NS)';
 $wb['mbox_txt'] = 'Yhteyshenkilön sähköpostiosoite';
 $wb['add_new_record_txt'] = 'Lisää uusi DNS-alue (SOA)';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_srv.lng b/interface/web/dns/lib/lang/fi_dns_srv.lng
index 679de7b3b17183697f0ac892735b90c61e89914e..1f136a2a81f1b7ac12d057dbe410678e1313e648 100755
--- a/interface/web/dns/lib/lang/fi_dns_srv.lng
+++ b/interface/web/dns/lib/lang/fi_dns_srv.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Verkkotunnus on vääränlainen.';
 $wb['data_error_empty'] = 'Palvelintietue on tyhjä.';
 $wb['data_error_regex'] = 'Palvelintietue on vääränlainen.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_template.lng b/interface/web/dns/lib/lang/fi_dns_template.lng
index 96a8978ca32c62759d96737300e1585c96015beb..b34a92d6a9e45fc952fadedf5defae9602e60b1f 100755
--- a/interface/web/dns/lib/lang/fi_dns_template.lng
+++ b/interface/web/dns/lib/lang/fi_dns_template.lng
@@ -4,4 +4,3 @@ $wb['fields_txt'] = 'Kentät';
 $wb['template_txt'] = 'Malli';
 $wb['visible_txt'] = 'Näkyvissä';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_template_list.lng b/interface/web/dns/lib/lang/fi_dns_template_list.lng
index 92dd4e76e769cc3b770f9849bc1e4513c642a830..47c8924237e420d826acb1600abc66f2a68921c8 100755
--- a/interface/web/dns/lib/lang/fi_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/fi_dns_template_list.lng
@@ -4,4 +4,3 @@ $wb['visible_txt'] = 'Näkyvissä';
 $wb['name_txt'] = 'Mallin nimi';
 $wb['add_new_record_txt'] = 'Lisää uusi mallitietue';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_txt.lng b/interface/web/dns/lib/lang/fi_dns_txt.lng
index dc1cfad7107e36b19bdc8c2e44da460f5a4f9f23..d1235ba07a181fdc1617572b1616fdde9154a7a9 100755
--- a/interface/web/dns/lib/lang/fi_dns_txt.lng
+++ b/interface/web/dns/lib/lang/fi_dns_txt.lng
@@ -13,4 +13,3 @@ $wb['name_error_regex'] = 'Verkkotunnus on vääränlainen.';
 $wb['data_error_empty'] = 'Tekstikenttä on tyhjä';
 $wb['data_error_regex'] = 'Tekstikenttä on vääränlainen';
 ?>
-
diff --git a/interface/web/dns/lib/lang/fi_dns_wizard.lng b/interface/web/dns/lib/lang/fi_dns_wizard.lng
index bf328d48804987beee919cf3ca88d832b57ffdcb..966447f78e65a51f3d5b07a4b8c912cb2906cb77 100755
--- a/interface/web/dns/lib/lang/fi_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/fi_dns_wizard.lng
@@ -11,4 +11,3 @@ $wb['ns2_txt'] = '2. nimipalvelin';
 $wb['ip_txt'] = 'IP-osoite';
 $wb['error_origin_empty'] = 'Verkkotunnusta ei ole annettu.';
 ?>
-
diff --git a/interface/web/help/lib/lang/fi.lng b/interface/web/help/lib/lang/fi.lng
index ddf4fac92c7ded52121357258cd57a8272c58174..62ab7717c674d44ca27bebfb84431f1776135caa 100755
--- a/interface/web/help/lib/lang/fi.lng
+++ b/interface/web/help/lib/lang/fi.lng
@@ -5,4 +5,3 @@ $wb['Send message'] = 'Lähetä tukipyyntö';
 $wb['View messages'] = 'Näytä tukipyynnöt';
 $wb['Support'] = 'Käyttäjätuki';
 ?>
-
diff --git a/interface/web/help/lib/lang/fi_support_message.lng b/interface/web/help/lib/lang/fi_support_message.lng
index 32997fe3ccf8d5c28a6ea168f681bd6cbd435839..1e693bc6ed1bda1a24ebe2e85e62b659eea16787 100755
--- a/interface/web/help/lib/lang/fi_support_message.lng
+++ b/interface/web/help/lib/lang/fi_support_message.lng
@@ -5,4 +5,3 @@ $wb['subject_txt'] = 'Tukipyynnön aihe';
 $wb['message_txt'] = 'Tukipyyntö';
 $wb['tstamp_txt'] = 'Päiväys';
 ?>
-
diff --git a/interface/web/help/lib/lang/fi_support_message_list.lng b/interface/web/help/lib/lang/fi_support_message_list.lng
index b7f58bfc810be6d486ac884c1d1a5195cf31cf09..4bbc1de7997da15cacbb0cf6aa0d108d0df5a39e 100755
--- a/interface/web/help/lib/lang/fi_support_message_list.lng
+++ b/interface/web/help/lib/lang/fi_support_message_list.lng
@@ -4,4 +4,3 @@ $wb['sender_id_txt'] = 'Tukipyynnön lähettäjä';
 $wb['subject_txt'] = 'Tukipyynnön aihe';
 $wb['add_new_record_txt'] = 'Lähetä uusi tukipyyntö';
 ?>
-
diff --git a/interface/web/js/lib/lang/fi_javascript.lng b/interface/web/js/lib/lang/fi_javascript.lng
index 414a88549c9997b0770bd82e1b346d601422652c..91456526143b0babf316a6230d71f7aeb160d8b9 100755
--- a/interface/web/js/lib/lang/fi_javascript.lng
+++ b/interface/web/js/lib/lang/fi_javascript.lng
@@ -6,4 +6,3 @@ $wb['password_strength_3_txt'] = 'Hyvä';
 $wb['password_strength_4_txt'] = 'Vahva';
 $wb['password_strength_5_txt'] = 'Erittäin vahva';
 ?>
-
diff --git a/interface/web/login/lib/lang/fi.lng b/interface/web/login/lib/lang/fi.lng
index b17ec1bc6532b5e2a142876e546626fffd342ec8..94908156aba67f2371424d46024863df30c1c9aa 100755
--- a/interface/web/login/lib/lang/fi.lng
+++ b/interface/web/login/lib/lang/fi.lng
@@ -10,4 +10,3 @@ $wb['pw_error_noinput'] = 'Anna sähköpostiosoite ja käyttäjätunnus.';
 $wb['pw_reset_mail_msg'] = 'Käyttäjätunnuksesi salasana ISPConfi3 Hallintapaneeliin on vaihdettu. Uusi salasanasi: ';
 $wb['pw_reset_mail_title'] = 'ISPConfi3 Hallintapaneelin salasana on vaihdettu.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/bg_mail_user.lng b/interface/web/mail/lib/lang/bg_mail_user.lng
index 6019160c68110aab9c986f8e9b3b0821f215e173..c181eb1255d249d1546ff14e02ca9c79f2d8e71f 100644
--- a/interface/web/mail/lib/lang/bg_mail_user.lng
+++ b/interface/web/mail/lib/lang/bg_mail_user.lng
@@ -27,4 +27,6 @@ $wb['welcome_mail_message'] = 'Welcome to your new email account.
 Your webmaster.';
 $wb['disableimap_txt'] = 'Disable IMAP';
 $wb['disablepop3_txt'] = 'Disable POP3';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng
index 289ad9395b45737f2133abf6721ba4ef255765eb..4c09d070f9d746df766e0ad6fb70099be5c4792f 100644
--- a/interface/web/mail/lib/lang/de_mail_user.lng
+++ b/interface/web/mail/lib/lang/de_mail_user.lng
@@ -1,31 +1,33 @@
-<?php
+<?php
 $wb['custom_mailfilter_txt'] = 'Custom mail filter recipe';
-$wb['email_txt'] = 'Email';
-$wb['cryptpwd_txt'] = 'Password';
-$wb['active_txt'] = 'Active';
+$wb['email_txt'] = 'Email';
+$wb['cryptpwd_txt'] = 'Password';
+$wb['active_txt'] = 'Active';
 $wb['email_error_isemail'] = 'Email address is invalid.';
 $wb['email_error_unique'] = 'Duplicate Emailaddress.';
-$wb['autoresponder_text_txt'] = 'Text';
-$wb['autoresponder_txt'] = 'Autoresponder';
-$wb['no_domain_perm'] = 'You have no permission for this domain.';
-$wb['error_no_pwd'] = 'Password is empty.';
-$wb['quota_error_isint'] = 'Mailbox size must be a number.';
-$wb['quota_txt'] = 'quota in MB';
-$wb['server_id_txt'] = 'server_id';
-$wb['password_txt'] = 'password';
-$wb['maildir_txt'] = 'maildir';
-$wb['postfix_txt'] = 'Enable Receiving';
-$wb['access_txt'] = 'Enable Access';
-$wb['policy_txt'] = 'Spamfilter';
+$wb['autoresponder_text_txt'] = 'Text';
+$wb['autoresponder_txt'] = 'Autoresponder';
+$wb['no_domain_perm'] = 'You have no permission for this domain.';
+$wb['error_no_pwd'] = 'Password is empty.';
+$wb['quota_error_isint'] = 'Mailbox size must be a number.';
+$wb['quota_txt'] = 'quota in MB';
+$wb['server_id_txt'] = 'server_id';
+$wb['password_txt'] = 'password';
+$wb['maildir_txt'] = 'maildir';
+$wb['postfix_txt'] = 'Enable Receiving';
+$wb['access_txt'] = 'Enable Access';
+$wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- not enabled -';
-$wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.';
-$wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is';
-$wb['welcome_mail_subject'] = 'Welcome to your new email account.';
-$wb['welcome_mail_message'] = 'Welcome to your new email account.

-

-Your webmaster.';
-$wb['disableimap_txt'] = 'Disable IMAP';
-$wb['disablepop3_txt'] = 'Disable POP3';
-$wb['password_strength_txt'] = 'Password strength';
-?>
-
+$wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.';
+$wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is';
+$wb['welcome_mail_subject'] = 'Welcome to your new email account.';
+$wb['welcome_mail_message'] = 'Welcome to your new email account.
+
+Your webmaster.';
+$wb['disableimap_txt'] = 'Disable IMAP';
+$wb['disablepop3_txt'] = 'Disable POP3';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
+?>
+
diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng
index e361a09e748e3ef5b212f41171e1532c31f4fca9..ec2618ad9ca607cffe443f4e106f6001127ae664 100644
--- a/interface/web/mail/lib/lang/en_mail_user.lng
+++ b/interface/web/mail/lib/lang/en_mail_user.lng
@@ -21,8 +21,10 @@ $wb["policy_txt"] = 'Spamfilter';
 $wb["no_policy"] = '- not enabled -';
 $wb["limit_mailbox_txt"] = 'The max. number of mailboxes for your account is reached.';
 $wb["limit_mailquota_txt"] = 'The max space for mailboxes is reached. The max. available space in MB is';
+$wb["welcome_mail_fromname_txt"] = 'ISPConfig3';
+$wb["welcome_mail_fromemail_txt"] = "webmaster@localhost.tld";
 $wb["welcome_mail_subject"] = 'Welcome to your new email account.';
-$wb["welcome_mail_message"] = "Welcome to your new email account.\n\nYour webmaster.";
+$wb["welcome_mail_message"] = "Welcome to your new email account. Your webmaster.";
 $wb["disableimap_txt"] = 'Disable IMAP';
 $wb["disablepop3_txt"] = 'Disable POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/es_mail_user.lng b/interface/web/mail/lib/lang/es_mail_user.lng
index 6019160c68110aab9c986f8e9b3b0821f215e173..c181eb1255d249d1546ff14e02ca9c79f2d8e71f 100644
--- a/interface/web/mail/lib/lang/es_mail_user.lng
+++ b/interface/web/mail/lib/lang/es_mail_user.lng
@@ -27,4 +27,6 @@ $wb['welcome_mail_message'] = 'Welcome to your new email account.
 Your webmaster.';
 $wb['disableimap_txt'] = 'Disable IMAP';
 $wb['disablepop3_txt'] = 'Disable POP3';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
 ?>
diff --git a/interface/web/mail/lib/lang/fi.lng b/interface/web/mail/lib/lang/fi.lng
index 340f2bb41129bf0c527495af7a7164f9460d52ea..9d5c4f6e958a0413c2ba8be5dfb0b936921b36b6 100755
--- a/interface/web/mail/lib/lang/fi.lng
+++ b/interface/web/mail/lib/lang/fi.lng
@@ -43,4 +43,3 @@ $wb['Content Filter'] = 'Sisältösuodatin';
 $wb['Global Filters'] = 'Yleiset suodattimet';
 $wb['Server'] = 'Palvelin';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_alias.lng b/interface/web/mail/lib/lang/fi_mail_alias.lng
index 40093b25eb547e22115c343c63d4a5edd58ff643..f3a6dad2116c7b8d879f635706e75463d1e14e77 100755
--- a/interface/web/mail/lib/lang/fi_mail_alias.lng
+++ b/interface/web/mail/lib/lang/fi_mail_alias.lng
@@ -8,4 +8,3 @@ $wb['no_domain_perm'] = 'Käyttäjätunnuksella ei ole oikeuksia tähän verkkot
 $wb['destination_error_isemail'] = 'Kohteena oleva sähköpostiosoite on vääränlainen.';
 $wb['limit_mailalias_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä aliasosoitteita.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_alias_list.lng b/interface/web/mail/lib/lang/fi_mail_alias_list.lng
index 1f2a31e916c09f49fabbcb45999d1515e9e301b2..37dad6eaa63d3a5d35ff71618b752a91055b28a7 100755
--- a/interface/web/mail/lib/lang/fi_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_alias_list.lng
@@ -6,4 +6,3 @@ $wb['destination_txt'] = 'Kohde';
 $wb['email_txt'] = 'Sähköpostiosoite';
 $wb['add_new_record_txt'] = 'Lisää uusi aliastunnus';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_blacklist.lng b/interface/web/mail/lib/lang/fi_mail_blacklist.lng
index b3236dc8126e92b284998c09c8233bac3a8f86c9..66cb93004e643e787eb070d5a9fc237ace48f8a1 100755
--- a/interface/web/mail/lib/lang/fi_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/fi_mail_blacklist.lng
@@ -7,4 +7,3 @@ $wb['source_error_notempty'] = 'Estetty osoite on tyhjä';
 $wb['type_txt'] = 'Tyyppi';
 $wb['limit_mailfilter_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä suodattimia.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_blacklist_list.lng b/interface/web/mail/lib/lang/fi_mail_blacklist_list.lng
index 7f3099e96547bcfa3cca5c1f03b53bae260d8395..2d792ffc6a9b212a14044bef5e85ac44fbffa09d 100755
--- a/interface/web/mail/lib/lang/fi_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_blacklist_list.lng
@@ -8,4 +8,3 @@ $wb['recipient_txt'] = 'Vastaanottaja';
 $wb['add_new_record_txt'] = 'Lisä uusi osoite estolistalle';
 $wb['access_txt'] = 'Yhteys';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_content_filter.lng b/interface/web/mail/lib/lang/fi_mail_content_filter.lng
index 22c7ba78c0b7bfd51c934ce1c94ed7e8ded693d5..9cac6d38ff53e70b8a03d751b54bec1e43f14a88 100755
--- a/interface/web/mail/lib/lang/fi_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/fi_mail_content_filter.lng
@@ -7,4 +7,3 @@ $wb['action_txt'] = 'Toiminto';
 $wb['active_txt'] = 'Käytössä';
 $wb['pattern_error_empty'] = 'Etsintäkuvio on tyhjä.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_content_filter_list.lng b/interface/web/mail/lib/lang/fi_mail_content_filter_list.lng
index 8a5bfc939a6100233aec4757a0e805c8157f1f66..ccd1b895e4730e88e73dbaba961d580344885f86 100755
--- a/interface/web/mail/lib/lang/fi_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_content_filter_list.lng
@@ -6,4 +6,3 @@ $wb['pattern_txt'] = 'Suodatuskuvio (RegExp)';
 $wb['action_txt'] = 'Toiminto';
 $wb['add_new_record_txt'] = 'Lisää uusi suodatussääntö';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_domain.lng b/interface/web/mail/lib/lang/fi_mail_domain.lng
index 5bb83dc195f1dbbb5a72fb45382ffbdc386e589f..d35f8a4fcdc4e5c1ed09891897496e9fd863ff7a 100755
--- a/interface/web/mail/lib/lang/fi_mail_domain.lng
+++ b/interface/web/mail/lib/lang/fi_mail_domain.lng
@@ -11,4 +11,3 @@ $wb['limit_maildomain_txt'] = 'Käyttäjatunnuksella on jo sallittu määrä pos
 $wb['policy_txt'] = 'Roskapostisuodatin';
 $wb['no_policy'] = '- ei Käytössä -';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_domain_catchall.lng b/interface/web/mail/lib/lang/fi_mail_domain_catchall.lng
index e326003ee2d3ebe48c9b0358bcad2eb3abdd800a..b4928d5369c679d04722478b5779a16d632f3131 100755
--- a/interface/web/mail/lib/lang/fi_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/fi_mail_domain_catchall.lng
@@ -7,4 +7,3 @@ $wb['no_domain_perm'] = 'Käyttäjätunnuksella ei ole oikeuksia tähän verkkot
 $wb['domain_error_regex'] = 'Vääränlainen verkkotunnus tai se sisältää kiellettyjä merkkejä.';
 $wb['limit_mailcatchall_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä Catchall-tunnuksia.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/fi_mail_domain_catchall_list.lng
index 7629bac073d0192e42a0e05835bdfd24f8f1e576..951807890f43cff319fdb660417b269cfedddc0f 100755
--- a/interface/web/mail/lib/lang/fi_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_domain_catchall_list.lng
@@ -7,4 +7,3 @@ $wb['server_id_txt'] = 'Palvelin';
 $wb['domain_txt'] = 'Verkkotunnus';
 $wb['add_new_record_txt'] = 'Lisää uusi Catchall-osoite';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_domain_list.lng b/interface/web/mail/lib/lang/fi_mail_domain_list.lng
index d0292a175d709bb8f8860350b6e7a2e29d9405a9..e8c4d2862c74db94ad8949eacbe97e43a73abb4e 100755
--- a/interface/web/mail/lib/lang/fi_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_domain_list.lng
@@ -5,4 +5,3 @@ $wb['domain_txt'] = 'Postiverkkotunnus';
 $wb['add_new_record_txt'] = 'Lisää uusi postiverkkotunnus.';
 $wb['active_txt'] = 'Käytössä';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_forward.lng b/interface/web/mail/lib/lang/fi_mail_forward.lng
index 3476c6df6e3092d93f4a97d3943e2fa94963596b..5423874b8fc29a4b5fd2a610ad54ce73bfb08ad3 100755
--- a/interface/web/mail/lib/lang/fi_mail_forward.lng
+++ b/interface/web/mail/lib/lang/fi_mail_forward.lng
@@ -4,4 +4,3 @@ $wb['destination_txt'] = 'Vastaanottajan sähköposti';
 $wb['active_txt'] = 'Käytössä';
 $wb['limit_mailforward_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä edelleenlähetysosoitteita.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_forward_list.lng b/interface/web/mail/lib/lang/fi_mail_forward_list.lng
index ac53a1a25cce06b93fb6f401334e30e4c8d16b1e..15aab44bf9ee42b91af14eafc00ed7cabd3e3874 100755
--- a/interface/web/mail/lib/lang/fi_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_forward_list.lng
@@ -6,4 +6,3 @@ $wb['destination_txt'] = 'Minne:';
 $wb['email_txt'] = 'Sähköpostiosoite';
 $wb['add_new_record_txt'] = 'Lisää uusi edelleenlähetysosoite';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_get.lng b/interface/web/mail/lib/lang/fi_mail_get.lng
index 9b79f7e53da4d02a30e7cbc5f5254f092651ab1d..6bc1dccf81c5b84535152db0d681548f1801f686 100755
--- a/interface/web/mail/lib/lang/fi_mail_get.lng
+++ b/interface/web/mail/lib/lang/fi_mail_get.lng
@@ -9,4 +9,3 @@ $wb['destination_txt'] = 'Kohdepostilaatikko';
 $wb['active_txt'] = 'Käytössä';
 $wb['limit_fetchmail_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä noudettavia osoitteita.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_get_list.lng b/interface/web/mail/lib/lang/fi_mail_get_list.lng
index 93eae9ecde2af525c54265e06f128b4fe909d6bc..be7a29f7c4639c7b605a9b36b6d010bd9f940abd 100755
--- a/interface/web/mail/lib/lang/fi_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_get_list.lng
@@ -7,4 +7,3 @@ $wb['source_username_txt'] = 'Käyttäjätunnus';
 $wb['destination_txt'] = 'Kohdepostilaatikko';
 $wb['add_new_record_txt'] = 'Lisää uusi tili';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_spamfilter.lng b/interface/web/mail/lib/lang/fi_mail_spamfilter.lng
index 31f0cb3e6084dc67f002d423cfaf86871d11ea30..a833ecacfc94f2c630f0203cd977fcf6ff856f46 100755
--- a/interface/web/mail/lib/lang/fi_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/fi_mail_spamfilter.lng
@@ -15,4 +15,3 @@ $wb['email_error_unique'] = 'Tälle sähköpostiosoitteelle on jo olemassa suoda
 $wb['spam_redirect_maildir_purge_txt'] = 'Poista edelleenohjauslaatikosta';
 $wb['days_txt'] = 'päivää vanhemmat viestit.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/fi_mail_spamfilter_list.lng
index bba401195317880658b22676c3712543e170a1bf..41f6e3b0d724ca56d6d5589cfc1996327ca0acb3 100755
--- a/interface/web/mail/lib/lang/fi_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_spamfilter_list.lng
@@ -6,4 +6,3 @@ $wb['server_name_txt'] = 'Palvelimen nimi';
 $wb['email_txt'] = 'Sähköpostiosoite';
 $wb['add_new_record_txt'] = 'Lisää osoite estolistalle';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_transport.lng b/interface/web/mail/lib/lang/fi_mail_transport.lng
index 44c05b5729b8a58a0a8c083c442e648819c675bf..4b4ad896a3f9563c25e9b38560ab04859a524761 100755
--- a/interface/web/mail/lib/lang/fi_mail_transport.lng
+++ b/interface/web/mail/lib/lang/fi_mail_transport.lng
@@ -8,4 +8,3 @@ $wb['sort_order_txt'] = 'Järjestä..';
 $wb['active_txt'] = 'Käytössä';
 $wb['limit_mailrouting_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä sähköpostireitityksiä.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_transport_list.lng b/interface/web/mail/lib/lang/fi_mail_transport_list.lng
index 435eea2efa47a51046eb7947e79d469855c8430f..e91c76e29a60041e0fbbdc6aa4588fa06f353480 100755
--- a/interface/web/mail/lib/lang/fi_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_transport_list.lng
@@ -7,4 +7,3 @@ $wb['transport_txt'] = 'Reitti';
 $wb['sort_order_txt'] = 'Järjestä..';
 $wb['add_new_record_txt'] = 'Lisää uusi reitti';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_user.lng b/interface/web/mail/lib/lang/fi_mail_user.lng
index 9a218ed8c5691df55578aa8f1ef7d363dee308de..b5835941ae545ed218937825cfa2756cf1ed3d23 100755
--- a/interface/web/mail/lib/lang/fi_mail_user.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user.lng
@@ -20,10 +20,11 @@ $wb['policy_txt'] = 'Roskapostisuodatin';
 $wb['no_policy'] = '- ei Käytössä -';
 $wb['limit_mailbox_txt'] = 'Tilisi sallittu postilaatikoiden määrä on ylitetty.';
 $wb['limit_mailquota_txt'] = 'Tilisi sallittu postilaatikoiden koko on ylitetty. Vapaa tila megatavuina on';
+$wb["welcome_mail_fromname_txt"] = 'ISPConfig3';
+$wb["welcome_mail_fromemail_txt"] = "webmaster@localhost.tld";
 $wb['welcome_mail_subject'] = 'Tervetuloa käyttämään uutta sähköpotitiliäsi.';
-$wb['welcome_mail_message'] = 'Tervetuloa käyttämään uutta sähköpotitiliäsi. Toivoo Antenniserverin väki.';
+$wb['welcome_mail_message'] = 'Tervetuloa käyttämään uutta sähköpotitiliäsi toivottaa Webmaster';
 $wb['disableimap_txt'] = 'Estä IMAP';
 $wb['disablepop3_txt'] = 'Estä POP3';
 $wb['password_strength_txt'] = 'Salasanan vahvuus';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_user_filter.lng b/interface/web/mail/lib/lang/fi_mail_user_filter.lng
index aedc25d318627c3a708e6ce58fe06e29c0a8384a..8ed85c504266e8a22be651dc0e4854ecd9f13c51 100755
--- a/interface/web/mail/lib/lang/fi_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user_filter.lng
@@ -7,4 +7,3 @@ $wb['rulename_error_empty'] = 'Säännön nimi on tyhjä.';
 $wb['searchterm_is_empty'] = 'Hakusana on tyhjä.';
 $wb['source_txt'] = 'Lähde';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_user_filter_list.lng b/interface/web/mail/lib/lang/fi_mail_user_filter_list.lng
index 3d8ead8232c7f0478fbe11841f006a37a41823bd..c089777286edea25431ef5f1c85431fc63bf626e 100755
--- a/interface/web/mail/lib/lang/fi_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user_filter_list.lng
@@ -2,4 +2,3 @@
 $wb['rulename_txt'] = 'Suodatussäännön nimi';
 $wb['add_new_record_txt'] = 'Lisää uusi suodatussääntö';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_user_list.lng b/interface/web/mail/lib/lang/fi_mail_user_list.lng
index 885f43411ed1075f976da70d8dbfa69ec313dc7b..2f876e00a80d11db673c1c4fc6f9319e00d6745e 100755
--- a/interface/web/mail/lib/lang/fi_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user_list.lng
@@ -4,4 +4,3 @@ $wb['email_txt'] = 'Sähköpostiosoite';
 $wb['autoresponder_txt'] = 'Lomavastaaja';
 $wb['add_new_record_txt'] = 'Lisää uusi postilaatikko';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_user_stats_list.lng b/interface/web/mail/lib/lang/fi_mail_user_stats_list.lng
index 27e6720f24595cdf138c9975e5250ce7a447fdd8..5f5b0391fc2b2b090e41ebac9b0648e24658e26e 100755
--- a/interface/web/mail/lib/lang/fi_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user_stats_list.lng
@@ -6,4 +6,3 @@ $wb['last_month_txt'] = 'Viime kuussa';
 $wb['this_year_txt'] = 'Tänä vuonna';
 $wb['last_year_txt'] = 'Viime vuonna';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_whitelist.lng b/interface/web/mail/lib/lang/fi_mail_whitelist.lng
index ca894d4234cc07ef5d3ccbb834a328735dfd8669..abd8e85f2b9cb8ca60adac31dc76acce40396ed2 100755
--- a/interface/web/mail/lib/lang/fi_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/fi_mail_whitelist.lng
@@ -7,4 +7,3 @@ $wb['source_error_notempty'] = 'Osoite on tyhjä';
 $wb['type_txt'] = 'Tyyppi';
 $wb['limit_mailfilter_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä suodattimia.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_mail_whitelist_list.lng b/interface/web/mail/lib/lang/fi_mail_whitelist_list.lng
index deebbb96044cf5c208944806077684ca01203d1a..57632b041c04e86485916b83ff57ab368483cf51 100755
--- a/interface/web/mail/lib/lang/fi_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_whitelist_list.lng
@@ -8,4 +8,3 @@ $wb['recipient_txt'] = 'Vastaanottaja';
 $wb['add_new_record_txt'] = 'Lisää uusi luotettu osoite';
 $wb['access_txt'] = 'yhteys';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/fi_spamfilter_blacklist.lng
index 531ae3cf6ca7c96be7d22348a093a2e468c76d41..f44c20f75fb4cf17de1db5bf9fa5f36d69d747dd 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_blacklist.lng
@@ -6,4 +6,3 @@ $wb['email_txt'] = 'Sähköpostiosoite';
 $wb['priority_txt'] = 'Tärkeysjärjestys';
 $wb['active_txt'] = 'Käytössä';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/fi_spamfilter_blacklist_list.lng
index 8044fa38d08bd5718197556c10b6bfaf25d78ab2..d448876ef2a59e2a04c8e9a9e3495ebc284a0e72 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_blacklist_list.lng
@@ -7,4 +7,3 @@ $wb['rid_txt'] = 'Käyttäjätunnus';
 $wb['email_txt'] = 'Estettävä sähköpostiosoite';
 $wb['add_new_record_txt'] = 'Lisää osoite estolistalle';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_config.lng b/interface/web/mail/lib/lang/fi_spamfilter_config.lng
index 4e65a74c2578a288bdbef891ece6cb006b3d8f05..7447b48c77ced26ba8a7008c57bdfd14e2d27f09 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_config.lng
@@ -18,4 +18,3 @@ $wb['relayhost_password_txt'] = 'Salasana';
 $wb['mailbox_size_limit_txt'] = 'Postilaatikon koko';
 $wb['message_size_limit_txt'] = 'Viestien enimmäiskoko';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_config_list.lng b/interface/web/mail/lib/lang/fi_spamfilter_config_list.lng
index c5c24d69adecdf609dcdda07a8c3f052891d449c..aee0c817374002ec90b8f49326ad9c49fbae0efd 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_config_list.lng
@@ -3,4 +3,3 @@ $wb['list_head_txt'] = 'Palvelimen asetukset';
 $wb['server_name_txt'] = 'Palvelin';
 $wb['server_id_txt'] = 'Palvelimen tunnus';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_policy.lng b/interface/web/mail/lib/lang/fi_spamfilter_policy.lng
index e7554b74b7147ff740d74cd19c8ef1c84d04c0df..8f61ba411b64d7bc3b9541af4d39f086e488c7fa 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_policy.lng
@@ -36,4 +36,3 @@ $wb['spam_admin_txt'] = 'Roskapostitunnisteiden ylläpitäjä';
 $wb['message_size_limit_txt'] = 'Viestin kokoraja';
 $wb['banned_rulenames_txt'] = 'Estojen sääntönimet';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/fi_spamfilter_policy_list.lng
index 0430a7eac1c654b67d3fea3968bde48e77f0e016..3074d45ff09a6c4c3e1c163e8e011600c74165f5 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_policy_list.lng
@@ -7,4 +7,3 @@ $wb['banned_files_lover_txt'] = 'Pitää estetyistä tiedostoista';
 $wb['bad_header_lover_txt'] = 'Pitää osikkovirheistä';
 $wb['add_new_record_txt'] = 'Lisää kohtelutapa';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_users.lng b/interface/web/mail/lib/lang/fi_spamfilter_users.lng
index b5810ea04f14de909d667e9ed421ec53141a419b..d960f5c82ad490ae19dadeb4005dc30ab24020c5 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_users.lng
@@ -6,4 +6,3 @@ $wb['email_txt'] = 'Sähköpostiosoite (RegExp)';
 $wb['fullname_txt'] = 'Koko nimi';
 $wb['local_txt'] = 'Paikallinen';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_users_list.lng b/interface/web/mail/lib/lang/fi_spamfilter_users_list.lng
index 97527a0d48e3c68b31a8cf87490082c4c8f14720..385d617a7485bb731793d356ff2abd086f7a8014 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_users_list.lng
@@ -8,4 +8,3 @@ $wb['fullname_txt'] = 'Koko nimi';
 $wb['email_txt'] = 'Sähköpostiosoite';
 $wb['add_new_record_txt'] = 'Lisää Roskapostisuodattimen käyttäjä';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/fi_spamfilter_whitelist.lng
index 5a6c403a22f49fd9b59349236689150c421d7ea2..78d2012ef3b6ca70025fe8233c96b1568a6126d5 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_whitelist.lng
@@ -6,4 +6,3 @@ $wb['email_txt'] = 'Sähköpostiosoite';
 $wb['priority_txt'] = 'Tärkeysjärjestys';
 $wb['active_txt'] = 'Käytössä';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fi_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/fi_spamfilter_whitelist_list.lng
index 05d5d3f982863fd3ae7ca0d61b99b92540743e42..a3f00fc848e39bf3283a4893b9bbb7f3275a9028 100755
--- a/interface/web/mail/lib/lang/fi_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/fi_spamfilter_whitelist_list.lng
@@ -7,4 +7,3 @@ $wb['rid_txt'] = 'Käyttäjä';
 $wb['email_txt'] = 'Luotettu osoite';
 $wb['add_new_record_txt'] = 'Lisää uusi luotettu osoite';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fr_mail_user.lng b/interface/web/mail/lib/lang/fr_mail_user.lng
index 6019160c68110aab9c986f8e9b3b0821f215e173..c181eb1255d249d1546ff14e02ca9c79f2d8e71f 100644
--- a/interface/web/mail/lib/lang/fr_mail_user.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user.lng
@@ -27,4 +27,6 @@ $wb['welcome_mail_message'] = 'Welcome to your new email account.
 Your webmaster.';
 $wb['disableimap_txt'] = 'Disable IMAP';
 $wb['disablepop3_txt'] = 'Disable POP3';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_user.lng b/interface/web/mail/lib/lang/it_mail_user.lng
index 6019160c68110aab9c986f8e9b3b0821f215e173..c181eb1255d249d1546ff14e02ca9c79f2d8e71f 100644
--- a/interface/web/mail/lib/lang/it_mail_user.lng
+++ b/interface/web/mail/lib/lang/it_mail_user.lng
@@ -27,4 +27,6 @@ $wb['welcome_mail_message'] = 'Welcome to your new email account.
 Your webmaster.';
 $wb['disableimap_txt'] = 'Disable IMAP';
 $wb['disablepop3_txt'] = 'Disable POP3';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
 ?>
diff --git a/interface/web/mail/lib/lang/nl_mail_user.lng b/interface/web/mail/lib/lang/nl_mail_user.lng
index 27311956bb954c354924d85c0028cbd094b6b994..08ef5a842755d281f55a22357073b39f33a642a4 100644
--- a/interface/web/mail/lib/lang/nl_mail_user.lng
+++ b/interface/web/mail/lib/lang/nl_mail_user.lng
@@ -27,4 +27,6 @@ $wb['welcome_mail_message'] = 'Welkom op uw nieuwe email account.
 Uw webmaster.';
 $wb['disableimap_txt'] = 'Uitschakelen IMAP';
 $wb['disablepop3_txt'] = 'Uitschakelen POP3';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
 ?>
diff --git a/interface/web/mail/lib/lang/ru_mail_user.lng b/interface/web/mail/lib/lang/ru_mail_user.lng
index aca58dae3ef93c8a6cfa045627b8fd59d6fbe34d..75e1f8dbc05eeab7d6c933e7ecb7b49089bd886b 100644
--- a/interface/web/mail/lib/lang/ru_mail_user.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user.lng
@@ -27,4 +27,6 @@ $wb['welcome_mail_message'] = 'Добро пожаловать в ваш нов
 $wb['password_strength_txt'] = 'Password strength';
 $wb['disableimap_txt'] = 'Disable IMAP';
 $wb['disablepop3_txt'] = 'Disable POP3';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
 ?>
diff --git a/interface/web/mail/lib/lang/se_mail_user.lng b/interface/web/mail/lib/lang/se_mail_user.lng
index 6019160c68110aab9c986f8e9b3b0821f215e173..c181eb1255d249d1546ff14e02ca9c79f2d8e71f 100644
--- a/interface/web/mail/lib/lang/se_mail_user.lng
+++ b/interface/web/mail/lib/lang/se_mail_user.lng
@@ -27,4 +27,6 @@ $wb['welcome_mail_message'] = 'Welcome to your new email account.
 Your webmaster.';
 $wb['disableimap_txt'] = 'Disable IMAP';
 $wb['disablepop3_txt'] = 'Disable POP3';
+$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
+$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
 ?>
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 59470f26686fd4d6558c792a35e6d13bcfb70f79..2942b960554afde933b50f44be059f731595449c 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -200,7 +200,28 @@ class page_action extends tform_actions {
 		$app->db->query("UPDATE mail_user SET sys_groupid = ".$domain["sys_groupid"]." WHERE mailuser_id = ".$this->id);
 		
 		// send a welcome email to create the mailbox
-		mail($this->dataRecord["email"],$app->tform->wordbook["welcome_mail_subject"],$app->tform->wordbook["welcome_mail_message"]);
+//		mail($this->dataRecord["email"],$app->tform->wordbook["welcome_mail_subject"],$app->tform->wordbook["welcome_mail_message"]);
+		
+		// tries to detect current charset, and encode subject-header and body from it to ISO-8859-1.
+		$fromCharset      = mb_detect_encoding($app->tform->wordbook["welcome_mail_subject"]);
+		$iconvPreferences = array("input-charset" => $fromCharset,
+					"output-charset" => "ISO-8859-1",
+					"line-length" => 76,
+					"line-break-chars" => "\r\n",
+					"scheme" => "Q");
+
+		$welcomeFromName  = $app->tform->wordbook["welcome_mail_fromname_txt"];
+		$welcomeFromEmail = $app->tform->wordbook["welcome_mail_fromemail_txt"];
+		$mailHeaders      = "MIME-Version: 1.0" . "\r\n";
+		$mailHeaders     .= "Content-type: text/plain; charset=iso-8859-1" . "\r\n";
+		$mailHeaders     .= "From: $welcomeFromName  <$welcomeFromEmail>" . "\r\n";
+		$mailHeaders     .= "Reply-To: <$welcomeFromEmail>" . "\r\n";
+		$mailTarget       = $this->dataRecord["email"];
+		$mailSubject      = iconv_mime_encode("trimoff", $app->tform->wordbook["welcome_mail_subject"], $iconvPreferences);
+		$mailSubject      = str_replace("trimoff: ", "", $mailSubject);
+		$mailBody         = iconv ($fromCharset, "ISO-8859-1", $app->tform->wordbook["welcome_mail_message"]);
+
+		mail($mailTarget, $mailSubject, $mailBody, $mailHeaders);
 		
 		// Spamfilter policy
 		$policy_id = intval($this->dataRecord["policy"]);
@@ -255,4 +276,4 @@ class page_action extends tform_actions {
 $app->tform_actions = new page_action;
 $app->tform_actions->onLoad();
 
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/monitor/lib/lang/fi.lng b/interface/web/monitor/lib/lang/fi.lng
index 651dc92658abe7722e574b591fcc4de975e8856f..e9eab30dc99a74d6eeb9835efd22cb4798fdaa53 100755
--- a/interface/web/monitor/lib/lang/fi.lng
+++ b/interface/web/monitor/lib/lang/fi.lng
@@ -135,4 +135,3 @@ $wb['monitor_title_raidstate_txt'] = 'RAID-laitteiden tila';
 $wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-tulokset';
 $wb['monitor_updates_nosupport_txt'] = 'Käyttämäsi Linux-jakelu ei tue päivitysten valvontaa.';
 ?>
-
diff --git a/interface/web/monitor/lib/lang/fi_datalog_list.lng b/interface/web/monitor/lib/lang/fi_datalog_list.lng
index 80007ebad90d32dbbc1db48d8080f3cd92041c20..eb26582613b834c8cf809b811b133866cb00d676 100755
--- a/interface/web/monitor/lib/lang/fi_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/fi_datalog_list.lng
@@ -6,4 +6,3 @@ $wb['dbtable_txt'] = 'Tietokannan taulu';
 $wb['action_txt'] = 'Toiminto';
 $wb['status_txt'] = 'Tila';
 ?>
-
diff --git a/interface/web/monitor/lib/lang/fi_syslog_list.lng b/interface/web/monitor/lib/lang/fi_syslog_list.lng
index d542e9b308d3cea17d75981d65a3464d9e53a1c3..54aaa4e30695755e5408424a15ccc36a2434f05b 100755
--- a/interface/web/monitor/lib/lang/fi_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/fi_syslog_list.lng
@@ -5,4 +5,3 @@ $wb['server_id_txt'] = 'Palvelin';
 $wb['loglevel_txt'] = 'Lokitaso';
 $wb['message_txt'] = 'Viesti';
 ?>
-
diff --git a/interface/web/sites/lib/lang/fi.lng b/interface/web/sites/lib/lang/fi.lng
index ca8621bf06720d18aa0ab6b617b29959d4070d36..fca962a402cea77fa9bfcf125b39a7566ebe0cdc 100755
--- a/interface/web/sites/lib/lang/fi.lng
+++ b/interface/web/sites/lib/lang/fi.lng
@@ -14,4 +14,3 @@ $wb['Shell-User'] = 'Shell-käyttäjä';
 $wb['Shell'] = 'Shell';
 $wb['Websites'] = 'Verkkotunnukset';
 ?>
-
diff --git a/interface/web/sites/lib/lang/fi_database.lng b/interface/web/sites/lib/lang/fi_database.lng
index d9016b5f0a6dcaf39240b2c5e5d7b24aab1901db..ce657407a2de5393655dd8d077d061bb2751a99d 100755
--- a/interface/web/sites/lib/lang/fi_database.lng
+++ b/interface/web/sites/lib/lang/fi_database.lng
@@ -19,4 +19,3 @@ $wb['password_strength_txt'] = 'Salasanan vahvuus';
 $wb['database_charset_txt'] = 'Tietokannan merkistö';
 $wb['database_charset_change_txt'] = 'Tietokannan merkistöä ei voi vaihtaa';
 ?>
-
diff --git a/interface/web/sites/lib/lang/fi_database_list.lng b/interface/web/sites/lib/lang/fi_database_list.lng
index 96bed62619516d0141c55f41bde9e06396668667..a231a6fb95b6796cb378becaeeacf97fa18e47f8 100755
--- a/interface/web/sites/lib/lang/fi_database_list.lng
+++ b/interface/web/sites/lib/lang/fi_database_list.lng
@@ -6,4 +6,3 @@ $wb['server_id_txt'] = 'Palvelin';
 $wb['database_name_txt'] = 'Tietokannnan nimi';
 $wb['add_new_record_txt'] = 'Lisää uusi tietokanta';
 ?>
-
diff --git a/interface/web/sites/lib/lang/fi_ftp_user.lng b/interface/web/sites/lib/lang/fi_ftp_user.lng
index 0bc36d1216c0d6c2d273eb009b6bb68882baa758..a121d5af3ca4b8acf6ce3a1f0a8f27bb95d55090 100755
--- a/interface/web/sites/lib/lang/fi_ftp_user.lng
+++ b/interface/web/sites/lib/lang/fi_ftp_user.lng
@@ -22,4 +22,3 @@ $wb['uid_error_empty'] = 'Käyttäjäryhmä-kenttä on tyhjä.';
 $wb['directory_error_empty'] = 'Kotihakemisto-kenttä on tyhjä.';
 $wb['password_strength_txt'] = 'Salasanan vahvuus';
 ?>
-
diff --git a/interface/web/sites/lib/lang/fi_ftp_user_list.lng b/interface/web/sites/lib/lang/fi_ftp_user_list.lng
index 38a143204cf676139bfbc1f2da3551b41acf0c52..81c60b6d71bc24571873fcb366b396c1fa8c6982 100755
--- a/interface/web/sites/lib/lang/fi_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/fi_ftp_user_list.lng
@@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Verkkotunnus';
 $wb['username_txt'] = 'Käyttäjätunnus';
 $wb['add_new_record_txt'] = 'Lisää uusi FTP-käyttäjätunnus';
 ?>
-
diff --git a/interface/web/sites/lib/lang/fi_shell_user.lng b/interface/web/sites/lib/lang/fi_shell_user.lng
index c845728e1079ce2632e25ce2ba7dc0206aba32f0..de3365f6f67a6ce3783761c1f83a3fb430f40742 100755
--- a/interface/web/sites/lib/lang/fi_shell_user.lng
+++ b/interface/web/sites/lib/lang/fi_shell_user.lng
@@ -19,4 +19,3 @@ $wb['directory_error_empty'] = 'Kansio-kenttä on tyhjä.';
 $wb['limit_shell_user_txt'] = 'Shell-käyttäjien määrä on ylitetty.';
 $wb['password_strength_txt'] = 'Salasanan vahvuus';
 ?>
-
diff --git a/interface/web/sites/lib/lang/fi_shell_user_list.lng b/interface/web/sites/lib/lang/fi_shell_user_list.lng
index d4e0ef3d0b5a1c57c76a5edd6dc963939ea39f65..c09edb230acb5e4a942fdb987238c38f38a01252 100755
--- a/interface/web/sites/lib/lang/fi_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/fi_shell_user_list.lng
@@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Verkkotunnus';
 $wb['username_txt'] = 'Käyttäjätunnus';
 $wb['add_new_record_txt'] = 'Lisää uusi Shell-käyttäjä';
 ?>
-
diff --git a/interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng
index b71999180591759a14c4f1b052ddeac30b7d03fe..8f5c5ccf12e77b7af7cc8b4d2e5e017cc8c36f72 100755
--- a/interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng
@@ -9,4 +9,3 @@ $wb['domain_error_empty'] = 'Aliasverkkotunnus on tyhjä.';
 $wb['domain_error_unique'] = 'Tämä aliasverkkotunnus on jo olemassa.';
 $wb['domain_error_regex'] = 'Aliasverkkotunnus on vääränlainen.';
 ?>
-
diff --git a/interface/web/sites/lib/lang/fi_web_domain.lng b/interface/web/sites/lib/lang/fi_web_domain.lng
index 524a4a8fe7118436a47721ac8a2a94cb961c681a..30a2c3be15e99a915901ac061f23c3dd8e6ac741 100755
--- a/interface/web/sites/lib/lang/fi_web_domain.lng
+++ b/interface/web/sites/lib/lang/fi_web_domain.lng
@@ -44,5 +44,4 @@ $wb['error_ssl_locality_empty'] = 'SSL-lokaali-kenttä on tyhjä.';
 $wb['error_ssl_organisation_empty'] = 'SSL-organisaatio-kenttä on tyhjä.';
 $wb['error_ssl_organisation_unit_empty'] = 'SSL-organisaatioyksikkö-kenttä on tyhjä.';
 $wb['error_ssl_country_empty'] = 'SSL-maa-kenttä on tyhjä.';
-?>
-
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/fi_web_domain_list.lng b/interface/web/sites/lib/lang/fi_web_domain_list.lng
index a990c3737f8f1f84ab9bbe399d2fb36652de530c..8f5691c2f8315fc08e96aeb0595fe78d269311bc 100755
--- a/interface/web/sites/lib/lang/fi_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_domain_list.lng
@@ -6,4 +6,3 @@ $wb['domain_txt'] = 'Verkkotunnus';
 $wb['add_new_record_txt'] = 'Lisää uusi verkkotunnus';
 $wb['domain_id_txt'] = 'Verkkotunnus';
 ?>
-
diff --git a/interface/web/sites/lib/lang/fi_web_subdomain.lng b/interface/web/sites/lib/lang/fi_web_subdomain.lng
index 7fe9c857f952fcb23a9dbc06cd8d120caff8c0e0..a7fa3868df7eb2a76f77fe22b58dff29d3095498 100755
--- a/interface/web/sites/lib/lang/fi_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/fi_web_subdomain.lng
@@ -36,4 +36,3 @@ $wb['domain_error_empty'] = 'Verkkotunnus-kenttä on tyhjä.';
 $wb['domain_error_unique'] = 'Tämä verkkotunnus on jo olemassa.';
 $wb['domain_error_regex'] = 'Verkkotunnus on vääränlainen.';
 ?>
-
diff --git a/interface/web/sites/lib/lang/fi_web_subdomain_list.lng b/interface/web/sites/lib/lang/fi_web_subdomain_list.lng
index e21c19f5052941998d24416960402afffde44ee5..31fb17028aaad6c705eaf03022d7218d9d5bdd9e 100755
--- a/interface/web/sites/lib/lang/fi_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_subdomain_list.lng
@@ -6,4 +6,3 @@ $wb['parent_domain_id_txt'] = 'Pääverkkotunnus';
 $wb['domain_txt'] = 'Aliverkkotunnus';
 $wb['add_new_record_txt'] = 'Lisää uusi aliverkkotunnus';
 ?>
-
diff --git a/interface/web/tools/lib/lang/fi.lng b/interface/web/tools/lib/lang/fi.lng
index 32c8ceb5e57d07780b6f4f18b14784bede887270..2f78ef6ccc8db1117ca2c012c8de1f689b663447 100755
--- a/interface/web/tools/lib/lang/fi.lng
+++ b/interface/web/tools/lib/lang/fi.lng
@@ -4,4 +4,3 @@ $wb['Settings'] = 'Aetukset';
 $wb['ISPConfig Tools'] = 'ISPConfig-työkalut';
 $wb['Password and Language'] = 'Salasanat ja kielet';
 ?>
-
diff --git a/interface/web/tools/lib/lang/fi_usersettings.lng b/interface/web/tools/lib/lang/fi_usersettings.lng
index 58a752a62702da5794f9e3cf73a6232eb8dcd350..16ec5cf1ab7f22d9c9929c8d1384bab7a05a8088 100755
--- a/interface/web/tools/lib/lang/fi_usersettings.lng
+++ b/interface/web/tools/lib/lang/fi_usersettings.lng
@@ -6,4 +6,3 @@ $wb['password_strength_txt'] = 'Salasanan vahvuus';
 $wb['Form to edit the user password and language.'] = 'Lomake käyttäjän salasanan ja kieliasetusten muokkaamiseen.';
 $wb['Settings'] = 'Asetukset';
 ?>
-