diff --git a/inc/common.php b/inc/common.php
index 63a9f37a060b748d8ee72cd33159285dd13d007d..3b4b38ffc2e19761d8280c0c2683da336252a538 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -655,6 +655,7 @@ function notify($id,$rev="",$summary=""){
     $diff = rawWiki($id);
   }
   $text = str_replace('@DIFF@',$diff,$text);
+  $subject = '['.$conf['title'].'] '.$subject;
 
   mail_send($conf['notify'],$subject,$text,$conf['mailfrom']);
 }
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index 15b5c79e347fb53652887ba0b7c6c84a4fbfa3df..e4f49cb9af809f01ad76efc2c81003598b00c242 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -73,8 +73,8 @@ $lang['created']    = 'vytvořeno';
 $lang['restored']   = 'stará verze byla obnovena';
 $lang['summary']    = 'Komentář k úpravám';
 
-$lang['mail_newpage'] = '[DokuWiki] nová stránka:';
-$lang['mail_changed'] = '[DokuWiki] změna stránky:';
+$lang['mail_newpage'] = 'nová stránka:';
+$lang['mail_changed'] = 'změna stránky:';
 
 $lang['nosmblinks'] = 'Odkazování na sdílené prostředky Windows funguje jen v Internet Exploreru.\nPřesto tento odkaz můžete zkopírovat a vložit jinde.';
 
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index bfbb6b3d4b32694815e0bb6cc61f8f0646595d8f..2d8e791bcb5fe5f19a2ecd979aa178945f081500 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -84,8 +84,8 @@ $lang['created']    = 'oprettet';
 $lang['restored']   = 'gammel udgave reetableret';
 $lang['summary']    = 'Redigerings resume';
 
-$lang['mail_newpage'] = '[DokuWiki] dokument tilføjet:';
-$lang['mail_changed'] = '[DokuWiki] dokument ændret:';
+$lang['mail_newpage'] = 'dokument tilføjet:';
+$lang['mail_changed'] = 'dokument ændret:';
 
 $lang['nosmblinks'] = 'Henvisninger til Windows shares virker kun i Microsoft Internet Explorer.\nDu kan stadig kopiere og indsætte linket.';
 
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index df7e71e7c973cdb4fcc10a5a7852438a9f5e7ddd..236a36aee41a85032816c1a0eb5d480a4063719f 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -89,8 +89,8 @@ $lang['created']    = 'angelegt';
 $lang['restored']   = 'alte Version wieder hergestellt';
 $lang['summary']    = 'Zusammenfassung';
 
-$lang['mail_newpage'] = '[DokuWiki] Neue Seite:';
-$lang['mail_changed'] = '[DokuWiki] Seite geaendert:';
+$lang['mail_newpage'] = 'Neue Seite:';
+$lang['mail_changed'] = 'Seite geaendert:';
 
 $lang['nosmblinks'] = 'Das Verlinken von Windows Freigaben funktioniert nur im Microsoft Internet Explorer.\nDer Link kann jedoch durch Kopieren und Einfügen verwendet werden.';
 
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 17f8e8388e1892889c0ddfb89051b71cbffbe97e..9dd2f46812946281b8a18ccf09b2bac0c2e3d974 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -87,8 +87,8 @@ $lang['created']    = 'created';
 $lang['restored']   = 'old revision restored';
 $lang['summary']    = 'Edit summary';
 
-$lang['mail_newpage'] = '[DokuWiki] page added:';
-$lang['mail_changed'] = '[DokuWiki] page changed:';
+$lang['mail_newpage'] = 'page added:';
+$lang['mail_changed'] = 'page changed:';
 
 $lang['nosmblinks'] = 'Linking to Windows shares only works in Microsoft Internet Explorer.\nYou still can copy and paste the link.';
 
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index 99c285940219e039892798f45a63755edd1b1d6d..b7b60429c0c14a6a708d1278962b681611c15479 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -75,8 +75,8 @@ $lang['restored']   = 'malnova revizio restarigita';
 $lang['summary']    = 'Bulteno de amendoj';
 
 
-$lang['mail_newpage'] = 'Paĝo [DokuWiki] estas aldonita:';
-$lang['mail_changed'] = 'Paĝo [DokuWiki] estas modifita:';
+$lang['mail_newpage'] = 'Paĝo estas aldonita:';
+$lang['mail_changed'] = 'Paĝo estas modifita:';
 
 $lang['nosmblinks'] = '';
 
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index a6e6dd588981688bf2f2ddce71caabcf3e3f5aba..0552e2997e921f21413800fef0ea353e98b8d9f1 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -58,8 +58,8 @@ $lang['by']         = 'por';
 $lang['deleted']    = 'borrado';
 $lang['created']    = 'creado';
 
-$lang['mail_newpage'] = '[DokuWiki] página añadida:';
-$lang['mail_changed'] = '[DokuWiki] página cambiada:';
+$lang['mail_newpage'] = 'página añadida:';
+$lang['mail_changed'] = 'página cambiada:';
 
 $lang['qb_bold']    = 'Texto Negrita';
 $lang['qb_italic']  = 'Texto Itálica';
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index 01ed0a250e31098ec4c03386cf5c55ebdb6eba87..465482ae03020d9b51c8dfa4851cc7dcd9336a31 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -82,8 +82,8 @@ $lang['created']    = 'tekitatud';
 $lang['restored']   = 'vana versioon taastatud';
 $lang['summary']    = 'kokkuvõte muudatustest';
 
-$lang['mail_newpage'] = '[DokuWiki] leht lisatud:';
-$lang['mail_changed'] = '[DokuWiki] leht muudetud';
+$lang['mail_newpage'] = 'leht lisatud:';
+$lang['mail_changed'] = 'leht muudetud';
 
 $lang['nosmblinks'] = 'Windowsis võrguarvutiga ühendamine toimib ainult Internet Exploreris ja 
 sisevõrgus.\nAga Sa saad õnneks omale lingi kopeerida ja hiljem kuhugi kleepida.';
diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php
index 9b396aaa1caa47591041d307b8ffadf5fba8dc58..4abf82815603e8aa1f8c4aec489120dd4629a9c3 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -62,8 +62,8 @@ $lang['created']    = 'sortua';
 $lang['restored']   = 'berrikuspen zaharra berrezarria';
 $lang['summary']    = 'Edit summary';
 
-$lang['mail_newpage'] = '[DokuWiki] gehitutako orria:';
-$lang['mail_changed'] = '[DokuWiki] aldatutako orria:';
+$lang['mail_newpage'] = 'gehitutako orria:';
+$lang['mail_changed'] = 'aldatutako orria:';
 
 $lang['qb_bold']    = 'Letra beltzez';
 $lang['qb_italic']  = 'Letra italiarrez';
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 1973ab7089b8996b5bb4e664a0cafe5b11ad1e17..93d8c7c5fe6308897731d6c5cd86ae51088a0e75 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -74,8 +74,8 @@ $lang['created']    = 'luotu';
 $lang['restored']   = 'vanhat versiot palautettu';
 $lang['summary']    = 'Yhteenveto muokkauksesta';
 
-$lang['mail_newpage'] = '[DokuWiki] sivu lisätty:';
-$lang['mail_changed'] = '[DokuWiki] sivu muutettu:';
+$lang['mail_newpage'] = 'sivu lisätty:';
+$lang['mail_changed'] = 'sivu muutettu:';
 
 $lang['nosmblinks'] = 'Linkit windows-jakoihin toimivat vain Microsof Internet Explorerilla.\nVoit silti kopioida ja liittää linkin.';
 
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index f9967e1cd72efd088fdfed350e1fc1eeca08dc0e..583e6acd5c399dfb0e8258cbbfd6df76b6feb544 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -80,8 +80,8 @@ $lang['created']    = 'créée';
 $lang['restored']   = 'ancienne révision restaurée';
 $lang['summary']    = 'Résumé des modifications';
 
-$lang['mail_newpage'] = '[DokuWiki] page ajoutée :';
-$lang['mail_changed'] = '[DokuWiki] page changée :';
+$lang['mail_newpage'] = 'page ajoutée :';
+$lang['mail_changed'] = 'page changée :';
 
 $lang['nosmblinks'] = 'Les liens vers les disques partagés de Windows ne fonctionnent qu\'avec Microsoft Internet Explorer.\nVou pouvez toujours faire un copier/coller du lien.';
 
diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 6f3bb54fc788c69f4bfb386439e5bf437ed5858a..329314edd60abe1649100c5a57565b2e0fc06e08 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -77,8 +77,8 @@ $lang['created']    = 'נוצר';
 $lang['restored']   = 'שוחזר';
 $lang['summary']    = 'עריכת תקציר';
 
-$lang['mail_newpage'] = 'דף [DokuWiki[ נוסף:';
-$lang['mail_changed'] = 'דף [DokuWiki[ שונה:';
+$lang['mail_newpage'] = 'דף נוסף:';
+$lang['mail_changed'] = 'דף שונה:';
 
 $lang['nosmblinks'] = 'קישור למערכת קבצים של חלונות פועל רק בדפדפן אינטרנט אקספלורר.\n זה בסדר, אין צורך לעבור. אפשר להעתיק ולהדביק את הקישור';
 
diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php
index 5c4414cb371fc218736a54a62f0c98ffa4aa46e9..ac8f26b19ffab889c5386f0dcb51583494c95f17 100644
--- a/inc/lang/hu/lang.php
+++ b/inc/lang/hu/lang.php
@@ -84,8 +84,8 @@ $lang['created']    = 'létrehozva';
 $lang['restored']   = 'az előző változat helyreállítva';
 $lang['summary']    = 'A változások összefoglalása';
 
-$lang['mail_newpage'] = '[DokuWiki] oldalak hozzáadva:';
-$lang['mail_changed'] = '[DokuWiki] oldalak megváltoztatva:';
+$lang['mail_newpage'] = 'oldalak hozzáadva:';
+$lang['mail_changed'] = 'oldalak megváltoztatva:';
 
 $lang['nosmblinks'] = 'A Windows megosztott könyvtárak kereszthivatkozása csak  Microsoft Internet Explorerben működik közvetlenül.\nA hivatkozást másolni és beszúrni ettől fügetlenül mndig tudod.';
 
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index 0b69fdec80f94ae75dd1a0d991fca5278dd83943..ca163afc96157b10da9b7b185e8e32959172ae1c 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -74,8 +74,8 @@ $lang['created']    = 'creata';
 $lang['restored']   = 'versione precedente ripristinata';
 $lang['summary']    = 'Oggetto della modifica';
 
-$lang['mail_newpage'] = '[DokuWiki] pagina aggiunta:';
-$lang['mail_changed'] = '[DokuWiki] pagina modificata:';
+$lang['mail_newpage'] = 'pagina aggiunta:';
+$lang['mail_changed'] = 'pagina modificata:';
 
 $lang['nosmblinks'] = 'I collegamenti con le risorse condivise di Windows funzionano solo con Microsoft Internet Explorer.\nPuoi fare un copia/incolla di questo collegamento.';
 
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index c42df28526a533e8fc6dcf63297408337dcbe3eb..1fc4ee64327e1f7f4bb47bfe44d98f4f975ace14 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -75,8 +75,8 @@ $lang['created']    = '새로 만듬';
 $lang['restored']   = '옛날 버전 복구';
 $lang['summary']    = '요약 편집';
 
-$lang['mail_newpage'] = '[DokuWiki] 페이지 추가:';
-$lang['mail_changed'] = '[DokuWiki] 페이지 변경:';
+$lang['mail_newpage'] = '페이지 추가:';
+$lang['mail_changed'] = '페이지 변경:';
 
 $lang['nosmblinks'] = '윈도우 공유파일과의 연결을 MS 익스플로러에서만 작동합니다.\n그렇지만 링크를 복사 붙여넣기할 수 있습니다.';
 
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index df45f7167f222bd119bb6d372108f754cc07f7c1..f562b686ea904e41bfe44bb84f3b6287e8311000 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -85,8 +85,8 @@ $lang['created']    = 'aangemaakt';
 $lang['restored']   = 'oude revisie hersteld';
 $lang['summary']    = 'Samenvatting aanpassen';
 
-$lang['mail_newpage'] = '[DokuWiki] pagina toegevoegd:';
-$lang['mail_changed'] = '[DokuWiki] pagina aangepast:';
+$lang['mail_newpage'] = 'pagina toegevoegd:';
+$lang['mail_changed'] = 'pagina aangepast:';
 
 $lang['nosmblinks'] = 'Linken naar Windows shares werkt alleen in Microsoft Internet Explorer.\nJe kan de link wel kopiëren en plakken.';
 
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index d879dada75783a32beed2e5bf2e1d51e0e5326a0..418363bd2dd45953775f0dc2b422f7fa1a2a6b89 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -84,8 +84,8 @@ $lang['created']    = 'lagret';
 $lang['restored']   = 'Gjenopprettet til en tidligere versjon';
 $lang['summary']    = 'Redigeringskommentar';
 
-$lang['mail_newpage'] = '[DokuWiki] side har blitt lagt til:';
-$lang['mail_changed'] = '[DokuWiki] side har blitt oppdatert:';
+$lang['mail_newpage'] = 'side har blitt lagt til:';
+$lang['mail_changed'] = 'side har blitt oppdatert:';
 
 $lang['nosmblinks'] = 'Lenker til Windowsressurser fungerer bare med Microsofts Internet Explorer.\nDu kan klippe og lime inn lenker hvis du anvender en annen nettleser enn MSIE..';
 
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index 17c5577a0544fbb9d831fa5c18f88c3e699c832d..e9ef83b1f3ba3b8a05db48fe7bffffa2e60cee60 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -87,8 +87,8 @@ $lang['created']      = 'criado';
 $lang['restored']     = 'Versão anterior restaurada.';
 $lang['summary']      = 'Sumário da Edição';
 
-$lang['mail_newpage'] = '[DokuWiki] página adicionada:';
-$lang['mail_changed'] = '[DokuWiki] página modificada:';
+$lang['mail_newpage'] = 'página adicionada:';
+$lang['mail_changed'] = 'página modificada:';
 
 $lang['nosmblinks']   = 'Links para pastas Windows partilhadas apenas funcionam com o Microsoft Internet Explorer.\nPode, no entanto, copiar e colar o link.';
 
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 9cbc29ff7b9f6bfb70a9d45016c8bd142a0ad271..305952cc9c84bbbb333134d77c58c549386891f1 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -75,8 +75,8 @@ $lang['created']      = 'Criação deste novo documento.';
 $lang['restored']     = 'Versão anterior restaurada.';
 $lang['summary']      = 'Sumário da Edição';
 
-$lang['mail_newpage'] = '[DokuWiki] documento adicionado:';
-$lang['mail_changed'] = '[DokuWiki] documento modificado:';
+$lang['mail_newpage'] = 'documento adicionado:';
+$lang['mail_changed'] = 'documento modificado:';
 
 $lang['nosmblinks']   = 'Ligação a pastas Windows partilhadas apenas funciona com o Microsoft Internet Explorer.\nPode no entanto copiar e colar o link.';
 
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index c351cb1352743248072e158ee1e3c383053074af..220cd45711a9827f38eec193ffcad9c5b0c08200 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -74,8 +74,8 @@ $lang['created']    = 'creat';
 $lang['restored']   = 'versiune veche restaurată';
 $lang['summary']    = 'Editează sumarul';
 
-$lang['mail_newpage'] = '[DokuWiki] pagina adăugată:';
-$lang['mail_changed'] = '[DokuWiki] page schimbată:';
+$lang['mail_newpage'] = 'pagina adăugată:';
+$lang['mail_changed'] = 'page schimbată:';
 
 $lang['nosmblinks'] = 'Legăturile către sharing-uri Windows funcţioneaza numai in Microsoft Internet Explorer.\nPuteţi însă copia şi insera legătura.';
 
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 5e0c738c9eb9598972b155fe18ce812a22cdaf92..e71314fde489243480e3e9980632baadb12f5cf1 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -75,8 +75,8 @@ $lang['restored']   = 'старая ревизия восстановлена';
 $lang['summary']    = 'Сводка изменений';
 
 
-$lang['mail_newpage'] = 'Страница [DokuWiki] добавлена:';
-$lang['mail_changed'] = 'Страница [DokuWiki] изменена:';
+$lang['mail_newpage'] = 'Страница добавлена:';
+$lang['mail_changed'] = 'Страница изменена:';
 
 $lang['nosmblinks'] = 'Ссылка на шаринги Windows работает только из Microsoft Internet Explorer.\nВы все же можете использовать copy and paste со ссылкой.';
 
diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php
index f50deeaca24e05de01b5b6c4c7162a172ad59f2f..59e6d0d4c6333654f3fcb7688aafe9eeb378e621 100644
--- a/inc/lang/sv/lang.php
+++ b/inc/lang/sv/lang.php
@@ -73,8 +73,8 @@ $lang['created']    = 'skapat';
 $lang['restored']   = 'tidigare version återskapad';
 $lang['summary']    = 'Redigeringskommentar';
 
-$lang['mail_newpage'] = '[DokuWiki] sida har lagts till:';
-$lang['mail_changed'] = '[DokuWiki] sida har uppdaterats:';
+$lang['mail_newpage'] = 'sida har lagts till:';
+$lang['mail_changed'] = 'sida har uppdaterats:';
 
 $lang['nosmblinks'] = 'Länkning till Windowsresurser fungerar bara med Microsofts Internet Explorer.\nDu kan klippa och klistra in länken om du använder en annan webbläsare än MSIE..';
 
diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php
index 6d145ffa0f1858e065d41bb96937809714c8870d..d064b9e31e4de26f58a141b9280e7c299d8fe553 100644
--- a/inc/lang/vi/lang.php
+++ b/inc/lang/vi/lang.php
@@ -78,8 +78,8 @@ $lang['created']    = 'được tạo ra';
 $lang['restored']   = 'phiên bản cũ đã được khôi phục';
 $lang['summary']    = 'Tóm tắt biên soạn';
 
-$lang['mail_newpage'] = 'Trang DokuWiki được thêm:';
-$lang['mail_changed'] = 'Trang DokuWiki thay đổi:';
+$lang['mail_newpage'] = 'Trang được thêm:';
+$lang['mail_changed'] = 'Trang thay đổi:';
 
 $lang['nosmblinks'] = 'Nối với các Windows shares chỉ có hiệu lực với Microsoft Internet Explorer.\nBạn vẫn có thể sao và chép các mốc nối.';
 
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index 8938820c9b9506c096bf69c0df04035ccdec1d7f..a2669f32bacd40a69ad498f76bfbf13c482de504 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -75,8 +75,8 @@ $lang['created']    = '建立';
 $lang['restored']   = '已恢復為舊版';
 $lang['summary']    = '編輯摘要';
 
-$lang['mail_newpage'] = '[DokuWiki] 增加的頁面:';
-$lang['mail_changed'] = '[DokuWiki] 變更的頁面:';
+$lang['mail_newpage'] = '增加的頁面:';
+$lang['mail_changed'] = '變更的頁面:';
 
 $lang['nosmblinks'] = '只有在 Microsoft IE 下才能執行「連結到 Windows shares」。\n不過您仍可拷貝、複製這連結';
 
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 13b4c5947b695aa0652e3c7a0f2d18a65312d058..f92078245898e9217c81badcd705425bec8de108 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -75,8 +75,8 @@ $lang['created']    = '
 $lang['restored']   = 'Òѻָ´Îª¾É°æ';
 $lang['summary']    = '±à¼­ÕªÒª';
 
-$lang['mail_newpage'] = '[DokuWiki] Ôö¼ÓµÄÒ³Ãæ:';
-$lang['mail_changed'] = '[DokuWiki] ±ä¸üµÄÒ³Ãæ:';
+$lang['mail_newpage'] = 'Ôö¼ÓµÄÒ³Ãæ:';
+$lang['mail_changed'] = '±ä¸üµÄÒ³Ãæ:';
 
 $lang['nosmblinks'] = 'Ö»ÓÐÔÚ Microsoft IE ϲÅÄÜÖ´ÐС¸Á¬½áµ½ Windows shares¡¹¡£\n²»¹ýÄúÈÔ¿É¿½±´¡¢¸´ÖÆÕâÁ¬½á';