diff --git a/_test/tests/inc/mailer.test.php b/_test/tests/inc/mailer.test.php
index 4a6645fe5dfc968f1a4f9260dfa5c57cea463a9b..5f9c09bea9c7dc6d7456a83917f490e44b05675d 100644
--- a/_test/tests/inc/mailer.test.php
+++ b/_test/tests/inc/mailer.test.php
@@ -242,5 +242,92 @@ class mailer_test extends DokuWikiTest {
         }
 
     }
+
+    function test_simplemailsignature(){
+        global $conf;
+        $conf['htmlmail'] = 0;
+
+        $mailbody = 'A test mail in ASCII';
+        $signature = "\n-- \n" . 'This mail was generated by DokuWiki at' . "\n" . DOKU_URL . "\n";
+        $mail = new TestMailer();
+        $mail->to('test@example.com');
+        $mail->setBody($mailbody);
+
+        $dump = $mail->dump();
+
+        // construct the expected mail body text - include the expected dokuwiki signature
+        $expected_mail_body = chunk_split(base64_encode($mailbody.$signature),72,MAILHEADER_EOL);
+        $this->assertRegexp('/'.preg_quote($expected_mail_body,'/').'/',$dump);
+
+        $conf['htmlmail'] = 1;
+    }
+
+    function test_htmlmailsignature(){
+        $mailbody_text = 'A test mail in ASCII :)';
+        $mailbody_html = 'A test mail in <strong>html</strong>';
+        $htmlmsg_expected = '<html>
+<head>
+    <title>My Test Wiki</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+A test mail in <strong>html</strong>
+
+<br /><hr />
+<small>This mail was generated by DokuWiki at<br /><a href="http://wiki.example.com/tmp/">http://wiki.example.com/tmp/</a></small>
+</body>
+</html>
+';
+
+        $mail = new TestMailer();
+        $mail->to('test@example.com');
+        $mail->setBody($mailbody_text,null,null,$mailbody_html);
+
+        $dump = $mail->dump();
+
+        // construct the expected mail body text - include the expected dokuwiki signature
+        $expected_mail_body = chunk_split(base64_encode($htmlmsg_expected),72,MAILHEADER_EOL);
+
+        $this->assertRegexp('/Content-Type: multipart/',$dump);
+        $this->assertRegexp('#Content-Type: text/plain; charset=UTF-8#',$dump);
+        $this->assertRegexp('/'.preg_quote($expected_mail_body,'/').'/',$dump);
+
+    }
+
+    function test_htmlmailsignaturecustom(){
+        global $lang;
+        $lang['email_signature_html'] = 'Official message from your DokuWiki @DOKUWIKIURL@<br />Created by wonderful mail class <a href="https://www.dokuwiki.org/devel:mail">https://www.dokuwiki.org/devel:mail</a>';
+
+        $mailbody_text = 'A test mail in ASCII :)';
+        $mailbody_html = 'A test mail in <strong>html</strong>';
+        $htmlmsg_expected = '<html>
+<head>
+    <title>My Test Wiki</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+
+A test mail in <strong>html</strong>
+
+<br /><hr />
+<small>Official message from your DokuWiki <a href="http://wiki.example.com/tmp/">http://wiki.example.com/tmp/</a><br />Created by wonderful mail class <a href="https://www.dokuwiki.org/devel:mail">https://www.dokuwiki.org/devel:mail</a></small>
+</body>
+</html>
+';
+
+        $mail = new TestMailer();
+        $mail->to('test@example.com');
+        $mail->setBody($mailbody_text,null,null,$mailbody_html);
+
+        $dump = $mail->dump();
+
+        // construct the expected mail body text - include the expected dokuwiki signature
+        $replacements = $mail->prop('replacements');
+        $expected_mail_body = chunk_split(base64_encode($htmlmsg_expected),72,MAILHEADER_EOL);
+
+        $this->assertRegexp('/'.preg_quote($expected_mail_body,'/').'/',$dump);
+
+    }
 }
 //Setup VIM: ex: et ts=4 :
diff --git a/inc/Mailer.class.php b/inc/Mailer.class.php
index 4e5062104d75753b4decd326aed2e20a9048e2ee..abc8463bb05b6bd1c7c77e99eb63926c50056166 100644
--- a/inc/Mailer.class.php
+++ b/inc/Mailer.class.php
@@ -620,9 +620,10 @@ class Mailer {
             'DOKUWIKIURL' => DOKU_URL,
             'USER' => $INPUT->server->str('REMOTE_USER'),
             'NAME' => $INFO['userinfo']['name'],
-            'MAIL' => $INFO['userinfo']['mail'],
-            'EMAILSIGNATURE' => "\n-- \n" . $lang['email_signature'] . "\n" . DOKU_URL . "\n",
+            'MAIL' => $INFO['userinfo']['mail']
         );
+        $signature = str_replace('@DOKUWIKIURL@',$this->replacements['text']['DOKUWIKIURL'], $lang['email_signature_text']);
+        $this->replacements['text']['EMAILSIGNATURE'] = "\n-- \n" . $signature . "\n";
 
         $this->replacements['html'] = array(
             'DATE' => '<i>' . hsc(dformat()) . '</i>',
@@ -634,10 +635,24 @@ class Mailer {
             'USER' => hsc($INPUT->server->str('REMOTE_USER')),
             'NAME' => hsc($INFO['userinfo']['name']),
             'MAIL' => '<a href="mailto:"' . hsc($INFO['userinfo']['mail']) . '">' .
-                hsc($INFO['userinfo']['mail']) . '</a>',
-            'EMAILSIGNATURE' => hsc($lang['email_signature']) . ':<br />' .
-                '<a href="' . DOKU_URL . '">' . DOKU_URL . '</a>',
+                hsc($INFO['userinfo']['mail']) . '</a>'
         );
+        $signature = $lang['email_signature_text'];
+        if(!empty($lang['email_signature_html'])) {
+            $signature = $lang['email_signature_html'];
+        }
+        $signature = str_replace(
+            array(
+                '@DOKUWIKIURL@',
+                "\n"
+            ),
+            array(
+                $this->replacements['html']['DOKUWIKIURL'],
+                '<br />'
+            ),
+            $signature
+        );
+        $this->replacements['html']['EMAILSIGNATURE'] = $signature;
     }
 
     /**
diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index a1b47f2239f075361cb2673cfac5a1ceadfb4187..e25d0ee5da915ecd2caf9c04c7cb66a6b8d014a8 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -345,4 +345,5 @@ $lang['currentns']             = 'Ù…Ø³Ø§ØØ© Ø§Ù„Ø§Ø³Ù… Ø§Ù„ØØ§Ù„ÙŠØ©';
 $lang['searchresult']          = 'Ù†ØªÙŠØ¬Ø© Ø§Ù„Ø¨ØØ«';
 $lang['plainhtml']             = 'Ù†Øµ HTML ØºÙŠØ± Ù…Ù†Ø³Ù‚';
 $lang['wikimarkup']            = 'Ø¹Ù„Ø§Ù…Ø§Øª Ø§Ù„ÙˆÙƒÙŠ';
-$lang['email_signature'] = 'Ø£Ù†Ø´Ø¦Øª Ù‡Ø°Ù‡ Ø§Ù„Ø±Ø³Ø§Ù„Ø© Ù…Ù† Ø¯ÙˆÙƒÙˆ ÙˆÙŠÙƒÙŠ ÙÙŠ';
+$lang['email_signature_text']       = 'Ø£Ù†Ø´Ø¦Øª Ù‡Ø°Ù‡ Ø§Ù„Ø±Ø³Ø§Ù„Ø© Ù…Ù† Ø¯ÙˆÙƒÙˆ ÙˆÙŠÙƒÙŠ ÙÙŠ
+@DOKUWIKIURL@';
diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php
index c027b373ae2978f8f6f4614a7c194e756ce2408a..b842c798fb2ed62726a0991d69691ea99b20559c 100644
--- a/inc/lang/az/lang.php
+++ b/inc/lang/az/lang.php
@@ -213,4 +213,5 @@ $lang['days']                  = '%d gÃ¼n É™vvÉ™l';
 $lang['hours']                 = '%d saat É™vvÉ™l';
 $lang['minutes']               = '%d dÉ™qiqÉ™ É™vvÉ™l';
 $lang['seconds']               = '%d saniyÉ™ É™vvÉ™l';
-$lang['email_signature'] = 'DokuWiki aÅŸaÄŸÄ±dakÄ± adresdÉ™ yerlÉ™ÅŸir';
+$lang['email_signature_text'] = 'DokuWiki aÅŸaÄŸÄ±dakÄ± adresdÉ™ yerlÉ™ÅŸir
+@DOKUWIKIURL@';
diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php
index be3006c55c56647ccf463020ed68b5bd267b1175..6296070d44bd01fce925ab4d7179bc836151a776 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Nikolay Vladimirov <nikolay@vladimiroff.com>
  * @author Viktor Usunov <usun0v@mail.bg>
  * @author Kiril <neohidra@gmail.com>
@@ -334,4 +334,5 @@ $lang['media_restore']         = 'Ð’ÑŠÐ·ÑÑ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ñ‚Ð°Ð·Ð¸ Ð²
 $lang['currentns']             = 'Ð¢ÐµÐºÑƒÑ‰Ð¾ Ð¸Ð¼ÐµÐ½Ð½Ð¾ Ð¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½ÑÑ‚Ð²Ð¾';
 $lang['searchresult']          = 'Ð ÐµÐ·ÑƒÐ»Ñ‚Ð°Ñ‚Ð¸ Ð¾Ñ‚ Ñ‚ÑŠÑ€ÑÐµÐ½ÐµÑ‚Ð¾';
 $lang['plainhtml']             = 'ÐžÐ±Ð¸ÐºÐ½Ð¾Ð²ÐµÐ½ HTML';
-$lang['email_signature'] = 'ÐŸÐ¸ÑÐ¼Ð¾Ñ‚Ð¾ Ðµ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð°Ð½Ð¾ Ð¾Ñ‚ DokuWiki Ð½Ð° Ð°Ð´Ñ€ÐµÑ';
+$lang['email_signature_text'] = 'ÐŸÐ¸ÑÐ¼Ð¾Ñ‚Ð¾ Ðµ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð°Ð½Ð¾ Ð¾Ñ‚ DokuWiki Ð½Ð° Ð°Ð´Ñ€ÐµÑ
+@DOKUWIKIURL@';
diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php
index 5391873de0d6340bbe43457be4c05ea386328d23..b899bf36ee0c1e1dccc586a7782f30c7c23a5e2d 100644
--- a/inc/lang/ca-valencia/lang.php
+++ b/inc/lang/ca-valencia/lang.php
@@ -218,4 +218,6 @@ $lang['days']                  = 'fa %d dies';
 $lang['hours']                 = 'fa %d hores';
 $lang['minutes']               = 'fa %d minuts';
 $lang['seconds']               = 'fa %d segons';
-$lang['email_signature'] = 'Este correu ha segut generat per DokuWiki en';
+$lang['email_signature_text'] = 'Este correu ha segut generat per DokuWiki en
+@DOKUWIKIURL@';
+
diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index 40c5f30a37a8de798d874a90a51cae23a709f40d..9b8f437da041f7af35cf222d0e1c9d67483c3324 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -331,7 +331,8 @@ $lang['media_perm_read']       = 'No teniu permisos suficients per a llegir arxi
 $lang['media_perm_upload']     = 'No teniu permisos suficients per a pujar arxius';
 $lang['media_update']          = 'Puja la nova versiÃ³';
 $lang['media_restore']         = 'Restaura aquesta versiÃ³';
-$lang['email_signature']       = 'Aquest mail ha estat generat per DokuWiki a';
+$lang['email_signature_text']       = 'Aquest mail ha estat generat per DokuWiki a
+@DOKUWIKIURL@';
 $lang['currentns']             = 'Espai de noms actual';
 $lang['searchresult']          = 'Resultats cerca';
 $lang['plainhtml']             = 'HTML pla';
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index 16ea738f1aa8a85ff369c2ab7f6b2afbc2cf1ad3..3abfdbffbdf2d1cb99274c1939c93569c9a510bd 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Bohumir Zamecnik <bohumir@zamecnik.org>
  * @author Tomas Valenta <t.valenta@sh.cvut.cz>
  * @author Tomas Valenta <tomas@valenta.cz>
@@ -353,4 +353,5 @@ $lang['plainhtml']             = 'ÄŒistÃ© HTML';
 $lang['wikimarkup']            = 'Wiki jazyk';
 $lang['page_nonexist_rev']     = 'StrÃ¡nka neexistovala na %s. Byla vytvoÅ™ena dodateÄne na <a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'Nelze rozebrat parametr "%s".';
-$lang['email_signature'] = 'Tento e-mail byl automaticky vygenerovÃ¡n systÃ©mem DokuWiki';
+$lang['email_signature_text'] = 'Tento e-mail byl automaticky vygenerovÃ¡n systÃ©mem DokuWiki
+@DOKUWIKIURL@';
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 24cf0e1fac811458a80bd3cd431ffdb32035decc..29f57ae1d12b1773d60eb1a0ba76ba37b1e730e0 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author koeppe <koeppe@kazur.dk>
  * @author Jon Bendtsen <bendtsen@diku.dk>
  * @author Lars NÃ¦sbye Christensen <larsnaesbye@stud.ku.dk>
@@ -350,4 +350,5 @@ $lang['searchresult']          = 'SÃ¸gsresultat';
 $lang['plainhtml']             = 'Ren HTML';
 $lang['wikimarkup']            = 'Wiki OpmÃ¦rkning';
 $lang['page_nonexist_rev']     = 'Siden blev ikke fundet ved %s. Den blev efterfÃ¸lgende oprettet ved <a href="%s">%s</a>.';
-$lang['email_signature'] = 'Denne e-mail blev genereret af DokuWiki pÃ¥';
+$lang['email_signature_text'] = 'Denne e-mail blev genereret af DokuWiki pÃ¥
+@DOKUWIKIURL@';
diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index 065848c6174c67625e43de4e594f3e244fd58331..be1084326c92ffb34dc5dcbae7e235752576c73f 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -350,7 +350,8 @@ $lang['media_restore']         = 'Diese Version wiederherstellen';
 $lang['media_acl_warning']     = 'Diese Liste ist mÃ¶glicherweise nicht vollstÃ¤ndig. Versteckte und durch ACL gesperrte Seiten werden nicht angezeigt.';
 $lang['currentns']             = 'Aktueller Namensraum';
 $lang['searchresult']          = 'Suchergebnis';
-$lang['email_signature']       = 'Diese E-Mail wurde erzeugt vom DokuWiki unter';
+$lang['email_signature_text']       = 'Diese E-Mail wurde erzeugt vom DokuWiki unter
+@DOKUWIKIURL@';
 $lang['plainhtml']             = 'Reines HTML';
 $lang['wikimarkup']            = 'Wiki Markup';
 $lang['page_nonexist_rev']     = 'Seite existierte nicht an der Stelle %s. Sie wurde an folgende Stelle erstellt: <a href="%s">%s</a>.';
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index abf44881c56d22c68c0d9d6659b1d038843ce101..0e04de18dafcf6baaf1f1df22f5461ba9605d034 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Christof <gagi@fin.de>
  * @author Anika Henke <anika@selfthinker.org>
@@ -360,4 +360,5 @@ $lang['plainhtml']             = 'HTML Klartext';
 $lang['wikimarkup']            = 'Wiki Markup';
 $lang['page_nonexist_rev']     = 'Die Seite exitiert nicht unter %s. Sie wurde aber unter <a href="%s">%s</a>';
 $lang['unable_to_parse_date']  = 'Parameter "%s" kann nicht geparsed werden.';
-$lang['email_signature'] = 'Diese E-Mail wurde erzeugt vom DokuWiki unter';
+$lang['email_signature_text'] = 'Diese E-Mail wurde erzeugt vom DokuWiki unter
+@DOKUWIKIURL@';
diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php
index 548a38c25a921d831774a7ac5bda02f8ff16485d..c32a0b0296842e9814e18f4036b843bd1542b800 100644
--- a/inc/lang/el/lang.php
+++ b/inc/lang/el/lang.php
@@ -326,4 +326,5 @@ $lang['media_perm_upload']     = 'Î£Ï…Î³Î½ÏŽÎ¼Î·, Î´ÎµÎ½ ÎÏ‡ÎµÏ„Îµ ÎµÏ€Î±ÏÎºÎ®
 $lang['media_update']          = 'Î¦ÏŒÏÏ„Ï‰ÏƒÎ· Î½ÎÎ±Ï‚ ÎÎºÎ´Î¿ÏƒÎ·Ï‚';
 $lang['media_restore']         = 'Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬ Î±Ï…Ï„Î® Ï„Î·Ï‚ ÎÎºÎ´Î¿ÏƒÎ·Ï‚';
 $lang['searchresult']          = 'Î‘Ï€Î¿Ï„ÎÎ»ÎµÏƒÎ¼Î± ÎÏÎµÏ…Î½Î±Ï‚';
-$lang['email_signature'] = 'Î‘Ï…Ï„ÏŒ Ï„Î¿ e-mail Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î®Î¸Î·ÎºÎµ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î± Î±Ï€ÏŒ Ï„Î·Î½ ÎµÏ†Î±ÏÎ¼Î¿Î³Î® DokuWiki ÏƒÏ„Î·Î½ Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·';
+$lang['email_signature_text'] = 'Î‘Ï…Ï„ÏŒ Ï„Î¿ e-mail Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î®Î¸Î·ÎºÎµ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î± Î±Ï€ÏŒ Ï„Î·Î½ ÎµÏ†Î±ÏÎ¼Î¿Î³Î® DokuWiki ÏƒÏ„Î·Î½ Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·
+@DOKUWIKIURL@';
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 105269ead44b63568d086c5b8a8c4cdae8f09214..2e7d368e228749a8fe4a461a4ba54a0c6dbe666e 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -368,5 +368,7 @@ $lang['plainhtml']             = 'Plain HTML';
 $lang['wikimarkup']            = 'Wiki Markup';
 $lang['page_nonexist_rev']     = 'Page did not exist at %s. It was subsequently created at <a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'Unable to parse at parameter "%s".';
-$lang['email_signature'] = 'This mail was generated by DokuWiki at';
+$lang['email_signature_text'] = 'This mail was generated by DokuWiki at
+@DOKUWIKIURL@';
+$lang['email_signature_html'] = '';
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index 82462cd94c025e80c0594702cb6760d883ffe324..fdccb899dd22280e8ca1e9a268364cc82152a156 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -337,4 +337,5 @@ $lang['currentns']             = 'Aktuala nomspaco';
 $lang['searchresult']          = 'SerÄ‰rezulto';
 $lang['plainhtml']             = 'Plena HTML';
 $lang['wikimarkup']            = 'Vikiteksto';
-$lang['email_signature'] = 'Tiu Ä‰i mesaÄo kreiÄis de DokuWiki Ä‰e';
+$lang['email_signature_text'] = 'Tiu Ä‰i mesaÄo kreiÄis de DokuWiki Ä‰e
+@DOKUWIKIURL@';
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index ff6a035a9cb61b088da9bfe7877f5d1455bb7399..e48c954dc2fb4b04901d737eae984d6dbe0fc733 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -376,4 +376,5 @@ $lang['plainhtml']             = 'HTML sencillo';
 $lang['wikimarkup']            = 'Etiquetado Wiki';
 $lang['page_nonexist_rev']     = 'La pÃ¡gina no existÃa en %s. Por tanto fue creada en <a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'Incapaz de evaluar el parÃ¡metro "%s".';
-$lang['email_signature']       = 'Este mail ha sido generado por DokuWiki en';
+$lang['email_signature_text']       = 'Este mail ha sido generado por DokuWiki en
+@DOKUWIKIURL@';
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index bda5e6483f642c9bf257c9f8a5ff60a09e8b391e..f8051d0fc0f38a26e9e6921392061adf8c4a13ef 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -333,4 +333,5 @@ $lang['currentns']             = 'Hetke nimeruum';
 $lang['searchresult']          = 'Otsingu tulemus';
 $lang['plainhtml']             = 'Liht-HTML';
 $lang['wikimarkup']            = 'Wiki mÃ¤rgistus';
-$lang['email_signature'] = 'See meil on saadetud DokuWiki poolt';
+$lang['email_signature_text'] = 'See meil on saadetud DokuWiki poolt
+@DOKUWIKIURL@';
diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php
index 5205bd6cf258fe8049159b49946bd17910d16317..fc33830c30a91bdcbc4a3fe39fd84966b119766a 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Xabi Ezpeleta <xezpeleta@mendikute.com>
  * @author Inko Illarramendi <inko.i.a@gmail.com>
  * @author Zigor Astarbe <astarbe@gmail.com>
@@ -306,4 +306,5 @@ $lang['media_viewold']         = '%s -n %s';
 $lang['media_edit']            = '%s editatu';
 $lang['media_update']          = 'Bertsio berria igo';
 $lang['media_restore']         = 'Bertsio hau berrezarri';
-$lang['email_signature'] = 'Email hau DokuWiki erabiliz sortu da';
+$lang['email_signature_text'] = 'Email hau DokuWiki erabiliz sortu da
+@DOKUWIKIURL@';
diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php
index feacf2460474f5912d686a27875ee3efc5223904..c8c36d2a6a9ee3e47301d3e8c6df37fcfe40cd86 100644
--- a/inc/lang/fa/lang.php
+++ b/inc/lang/fa/lang.php
@@ -347,6 +347,7 @@ $lang['currentns']             = 'ÙØ¶Ø§ÛŒ Ù†Ø§Ù… Ø¬Ø§Ø±ÛŒ';
 $lang['searchresult']          = 'Ù†ØªÛŒØ¬Ù‡â€ŒÛŒ Ø¬Ø³ØªØ¬Ùˆ';
 $lang['plainhtml']             = 'HTML Ø³Ø§Ø¯Ù‡';
 $lang['wikimarkup']            = 'Ù†Ø´Ø§Ù†Ù‡â€ŒÚ¯Ø°Ø§Ø±ÛŒ ÙˆÛŒÚ©ÛŒ';
-$lang['email_signature'] = 'Ø§ÛŒÙ† Ø§ÛŒÙ…ÛŒÙ„ ØªÙˆØ³Ø· DokuWiki ØªÙˆÙ„ÛŒØ¯ Ø´Ø¯Ù‡ Ø§Ø³Øª';
+$lang['email_signature_text'] = 'Ø§ÛŒÙ† Ø§ÛŒÙ…ÛŒÙ„ ØªÙˆØ³Ø· DokuWiki ØªÙˆÙ„ÛŒØ¯ Ø´Ø¯Ù‡ Ø§Ø³Øª
+@DOKUWIKIURL@';
 $lang['page_nonexist_rev']     = 'ØµÙØÙ‡ %s ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø´Øª. Ø§ÛŒÙ† ØµÙØÙ‡ Ù…Ø¹Ø§Ù‚Ø¨Ø§Ù‹ Ø¯Ø±<a href="%s">%s</a> Ø§ÛŒØ¬Ø§Ø¯ Ø´Ø¯.';
 $lang['unable_to_parse_date']  = 'Ø§Ù…Ú©Ø§Ù† ØªØ¬Ø²ÛŒÙ‡ Ùˆ ØªØÙ„ÛŒÙ„ Ù¾Ø§Ø±Ø§Ù…ØªØ± Â«%sÂ» ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯.';
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 2bf5d68583eeee7ff688e85f1b180c1e0420494f..779f69f91ea3bf0f90ec2a6a2349bdb8ff775cef 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -337,4 +337,5 @@ $lang['searchresult']          = 'Haun tulokset';
 $lang['plainhtml']             = 'pelkkÃ¤ HTML';
 $lang['wikimarkup']            = 'Wiki markup';
 $lang['unable_to_parse_date']  = 'Parametrin "%s" jÃ¤sennys ei onnistu.';
-$lang['email_signature'] = 'TÃ¤mÃ¤n postin loi DokuWiki osoitteessa';
+$lang['email_signature_text'] = 'TÃ¤mÃ¤n postin loi DokuWiki osoitteessa
+@DOKUWIKIURL@';
diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php
index cd2c37397656d266d3984391fd4ea20c41ce4886..50f2faca7d25cfc6cea5c034e9f983432ebd3147 100644
--- a/inc/lang/fo/lang.php
+++ b/inc/lang/fo/lang.php
@@ -167,4 +167,5 @@ $lang['img_format']            = 'SniÃ°:';
 $lang['img_camera']            = 'FototÃ³l:';
 $lang['img_keywords']          = 'EvnisorÃ°:';
 $lang['authtempfail']          = 'Validering av brÃºkara virkar fyribils ikki. Um hetta er varandi, fÃ¡ so samband viÃ° umboÃ°sstjÃ³ran Ã¡ hesi wiki.';
-$lang['email_signature'] = 'Hesin t-postur var skaptur av DokuWiki Ã¡';
+$lang['email_signature_text'] = 'Hesin t-postur var skaptur av DokuWiki Ã¡
+@DOKUWIKIURL@';
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 08847f20e00d419bfc31377085a40cd867dc9eb7..4d4f25494ee2984074d7ad3a85c2f5166ff974ed 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author SÃ©bastien Bauer <sebastien.bauer@advalvas.be>
  * @author Antoine Fixary <antoine.fixary@freesbee.fr>
  * @author cumulus <pta-n56@myamail.com>
@@ -369,4 +369,5 @@ $lang['plainhtml']             = 'HTML brut';
 $lang['wikimarkup']            = 'Wiki balise';
 $lang['page_nonexist_rev']     = 'La page n\'existait pas le %s. Elle a Ã©tÃ© crÃ©Ã©e le <a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'Ne peut analyser le paramÃ¨tre date "%s".';
-$lang['email_signature'] = 'Ce courriel a Ã©tÃ© gÃ©nÃ©rÃ© par DokuWiki depuis';
+$lang['email_signature_text'] = 'Ce courriel a Ã©tÃ© gÃ©nÃ©rÃ© par DokuWiki depuis
+@DOKUWIKIURL@';
diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php
index 087c0bf34315e12a1eae169961a5d3540ca9eb28..941989a32aa7c3cb91619bbb70b7fc4b89c7ac9f 100644
--- a/inc/lang/gl/lang.php
+++ b/inc/lang/gl/lang.php
@@ -315,4 +315,5 @@ $lang['media_perm_read']       = 'SentÃmolo, non tes permisos suficientes para
 $lang['media_perm_upload']     = 'SentÃmolo, non tes permisos suficientes para subir arquivos.';
 $lang['media_update']          = 'Subir nova versiÃ³n';
 $lang['media_restore']         = 'Restaurar esta versiÃ³n';
-$lang['email_signature'] = 'Este correo foi xerado polo DokuWiki en';
+$lang['email_signature_text'] = 'Este correo foi xerado polo DokuWiki en
+@DOKUWIKIURL@';
diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 21eff89832c7d3c0ce6fada99de619dafdbb4668..49f17c3e4306cfd566511e011baa068f520ee460 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author ×’×™× ×©×¤×¨ <guysoft@ort.org.il>
  * @author Denis Simakov <akinoame1@gmail.com>
  * @author Dotan Kamber <kamberd@yahoo.com>
@@ -349,4 +349,5 @@ $lang['searchresult']          = '×ª×•×¦××•×ª ×—×™×¤×•×©';
 $lang['plainhtml']             = 'HTML ×¤×©×•×˜';
 $lang['page_nonexist_rev']     = '×”×¢×ž×•×“ ×œ× ×§×™×™× ×‘%s. ×”×¢×ž×•×“ × ×•×¦×¨ ×‘×ž×§×•× ×–××ª ×‘<a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = '×œ× × ×™×ª×Ÿ ×œ×¤×¢× ×— ×¤×¨×ž×˜×¨ "%s".';
-$lang['email_signature'] = '×”×•×“×¢×ª ×“×•××´×œ ×–×• × ×•×¦×¨×” ×¢×œ ×™×“×™ ×”Ö¾DokuWiki ×”×–×ž×™×Ÿ ×‘×›×ª×•×‘×ª';
+$lang['email_signature_text'] = '×”×•×“×¢×ª ×“×•××´×œ ×–×• × ×•×¦×¨×” ×¢×œ ×™×“×™ ×”Ö¾DokuWiki ×”×–×ž×™×Ÿ ×‘×›×ª×•×‘×ª
+@DOKUWIKIURL@';
diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php
index 65a90048454e3de5f8c6fa674a39693baaf12744..e46e7368abc772d4ec081ed1bd722ed08745e254 100644
--- a/inc/lang/hr/lang.php
+++ b/inc/lang/hr/lang.php
@@ -341,4 +341,5 @@ $lang['plainhtml']             = 'ÄŒisti HTML';
 $lang['wikimarkup']            = 'Wiki kod';
 $lang['page_nonexist_rev']     = 'Stranica ne postoji na %s. Ona je naknadno napravljena na <a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'Ne mogu analizirati parametar "%s".';
-$lang['email_signature'] = 'Ovaj email je poslan na';
+$lang['email_signature_text'] = 'Ovaj email je poslan na
+@DOKUWIKIURL@';
diff --git a/inc/lang/hu-formal/lang.php b/inc/lang/hu-formal/lang.php
index 7d6d69d8930d67a3c93def2e699c100c8186fb30..66ff893f34c876052552667a151d39e979cb13e4 100644
--- a/inc/lang/hu-formal/lang.php
+++ b/inc/lang/hu-formal/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Marina Vladi <deldadam@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
@@ -25,4 +25,5 @@ $lang['btn_older']             = 'rÃ©gebbi >>';
 $lang['btn_revs']              = 'KorÃ¡bbi vÃ¡ltozatok';
 $lang['btn_recent']            = 'LegÃºjabb vÃ¡ltozÃ¡sok';
 $lang['btn_upload']            = 'FeltÃ¶ltÃ©s';
-$lang['email_signature'] = 'Ezt a levelet a DokuWiki generÃ¡lta';
+$lang['email_signature_text'] = 'Ezt a levelet a DokuWiki generÃ¡lta
+@DOKUWIKIURL@';
diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php
index 106e751f8479fa3a01bc9a878f46511461393d98..cbb337488c709bdce1cadc5b25dd1ba1ed68bca3 100644
--- a/inc/lang/hu/lang.php
+++ b/inc/lang/hu/lang.php
@@ -345,6 +345,7 @@ $lang['currentns']             = 'AktuÃ¡lis nÃ©vtÃ©r';
 $lang['searchresult']          = 'KeresÃ©s eredmÃ©nye';
 $lang['plainhtml']             = 'Sima HTML';
 $lang['wikimarkup']            = 'Wiki-jelÃ¶lÅ‘nyelv';
-$lang['email_signature']       = 'Ezt a levelet a DokuWiki generÃ¡lta';
+$lang['email_signature_text']       = 'Ezt a levelet a DokuWiki generÃ¡lta
+@DOKUWIKIURL@';
 $lang['page_nonexist_rev']     = 'A(z) %s oldal nem lÃ©tezik. KÃ©sÅ‘bb lett lÃ©trehozva a(z) <a href="%s">%s</a> helyen.';
 $lang['unable_to_parse_date']  = 'A "%s" paramÃ©ter feldolgozÃ¡sa sikertelen.';
diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php
index ad9ec1f346a7123e257b5a8f101af38961244d97..b40d99c48f88898fb28a668862b5887758ad7cb3 100644
--- a/inc/lang/ia/lang.php
+++ b/inc/lang/ia/lang.php
@@ -258,4 +258,5 @@ $lang['days']                  = '%d dies retro';
 $lang['hours']                 = '%d horas retro';
 $lang['minutes']               = '%d minutas retro';
 $lang['seconds']               = '%d secundas retro';
-$lang['email_signature'] = 'Iste message ha essite generate per DokuWiki a';
+$lang['email_signature_text'] = 'Iste message ha essite generate per DokuWiki a
+@DOKUWIKIURL@';
diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php
index 96a172f4c5ab43172d9f565b01f1609d97d52c15..fad99299c780f38bbbb46d10a4fe2b0ca379684e 100644
--- a/inc/lang/id/lang.php
+++ b/inc/lang/id/lang.php
@@ -309,4 +309,5 @@ $lang['media_restore']         = 'Kembalikan versi ini';
 $lang['currentns']             = 'Namespace saat ini';
 $lang['searchresult']          = 'Hasil Pencarian';
 $lang['wikimarkup']            = 'Markah Wiki';
-$lang['email_signature'] = 'Email ini dibuat otomatis oleh DokuWiki';
+$lang['email_signature_text'] = 'Email ini dibuat otomatis oleh DokuWiki
+@DOKUWIKIURL@';
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index 7188663a05692a228997391d5cbe330fef151d95..24e670cf76d73d2b004e1cba5bf6611f1fce73a2 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -355,5 +355,6 @@ $lang['searchresult']          = 'Risultati della ricerca';
 $lang['plainhtml']             = 'HTML';
 $lang['wikimarkup']            = 'Marcatura wiki';
 $lang['page_nonexist_rev']     = 'Pagina non esistente a %s. E\' stata creata successivamente a <a href="%s">%s</a>.';
-$lang['email_signature']       = 'Questa email Ã¨ stata generata dal DokuWiki all\'indirizzo';
+$lang['email_signature_text']       = 'Questa email Ã¨ stata generata dal DokuWiki all\'indirizzo
+@DOKUWIKIURL@';
 $lang['unable_to_parse_date']  = 'Impossibile eseguire l\'analisi al parametro "%s".';
diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index 7883b24050cf8217af5b5c649b117d60e50b4c71..03ed5538954332e04bab9f82f286723f9c9796a5 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Yuji Takenaka <webmaster@davilin.com>
  * @author Ikuo Obataya <i.obataya@gmail.com>
  * @author Daniel Dupriest <kououken@gmail.com>
@@ -345,4 +345,5 @@ $lang['plainhtml']             = 'ãƒ—ãƒ¬ãƒ¼ãƒ³HTML';
 $lang['wikimarkup']            = 'Wikiãƒžãƒ¼ã‚¯ã‚¢ãƒƒãƒ—';
 $lang['page_nonexist_rev']     = 'æŒ‡å®šãƒšãƒ¼ã‚¸ %s ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚ã“ã®ãƒªãƒ³ã‚¯ <a href="%s">%s</a> ã‹ã‚‰ä½œæˆã§ãã¾ã™ã€‚';
 $lang['unable_to_parse_date']  = 'ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ "%s" ã‚’å‡¦ç†ã§ãã¾ã›ã‚“ã€‚';
-$lang['email_signature'] = 'ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯æ¬¡ã®DokuWikiã‚ˆã‚Šè‡ªå‹•çš„ã«é€ä¿¡ã•ã‚Œã¦ã„ã¾ã™ã€‚';
+$lang['email_signature_text'] = 'ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯æ¬¡ã®DokuWikiã‚ˆã‚Šè‡ªå‹•çš„ã«é€ä¿¡ã•ã‚Œã¦ã„ã¾ã™ã€‚
+@DOKUWIKIURL@';
diff --git a/inc/lang/km/lang.php b/inc/lang/km/lang.php
index 1b2bfdc8b4d2aa821ed893d17dda9c16d18e8c2d..2dbc0d385c2ade44d4bb113d90cd98dd3bd88dfc 100644
--- a/inc/lang/km/lang.php
+++ b/inc/lang/km/lang.php
@@ -198,4 +198,5 @@ $lang['i_pol2']       = 'ážœáž¸áž‚áž¸áž”áž·áž‘áž‡áž·áž';
 $lang['i_retry']      = 'áž˜áŸ’ážáž„áž‘áŸ€áž';
 
 //Setup VIM: ex: et ts=2 :
-$lang['email_signature'] = 'áž¢áŸŠáž¸áž˜áŸáž›áž“áŸáŸ‡áž”áž“áŸ’áž…áŸáž¢áž–áž¸ážŒáŸ„áž‚áž¼ážœáž¸áž‚áž¸áž“áŸ…';
+$lang['email_signature_text'] = 'áž¢áŸŠáž¸áž˜áŸáž›áž“áŸáŸ‡áž”áž“áŸ’áž…áŸáž¢áž–áž¸ážŒáŸ„áž‚áž¼ážœáž¸áž‚áž¸áž“áŸ…
+@DOKUWIKIURL@';
diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php
index 1c0883837dcc2d964f0b3e5ac3a851b64179dd3d..5f5f59e1281d48985662b28c815eb80719c48a40 100644
--- a/inc/lang/la/lang.php
+++ b/inc/lang/la/lang.php
@@ -257,4 +257,5 @@ $lang['hours']                 = 'a horis %d';
 $lang['minutes']               = 'a minutis %d';
 $lang['seconds']               = 'a secundis %d';
 $lang['wordblock']             = 'Mutationes non seruantur, eo quod mala uerba contenit';
-$lang['email_signature'] = 'Hic cursus generatus a';
+$lang['email_signature_text'] = 'Hic cursus generatus a
+@DOKUWIKIURL@';
diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php
index e06ba5d1c00ec84d03f29dd013b0a75044860ee1..f15e878b467c1b7380f51ebb9feb8440e83f69fe 100644
--- a/inc/lang/lb/lang.php
+++ b/inc/lang/lb/lang.php
@@ -192,4 +192,5 @@ $lang['days']                  = 'virun %d Deeg';
 $lang['hours']                 = 'virun %d Stonnen';
 $lang['minutes']               = 'virun %d Minutten';
 $lang['seconds']               = 'virun %d Sekonnen';
-$lang['email_signature'] = 'DÃ«s Mail gouf generÃ©iert vun DokuWiki op';
+$lang['email_signature_text'] = 'DÃ«s Mail gouf generÃ©iert vun DokuWiki op
+@DOKUWIKIURL@';
diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php
index 9e68269281b5c485c0e738b89027bb764a56261c..dcf0985ec04c9bc5abb53a6f616f6d8ae7801735 100644
--- a/inc/lang/lt/lang.php
+++ b/inc/lang/lt/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Linas Valiukas <shirshegsm@gmail.com>
  * @author Edmondas Girkantas <eg@zemaitija.net>
  * @author ArÅ«nas VaitekÅ«nas <aras@fan.lt>
@@ -180,4 +180,5 @@ $lang['i_wikiname']            = 'Wiki vardas';
 $lang['i_enableacl']           = 'Ä®jungti ACL (rekomenduojama)';
 $lang['i_superuser']           = 'Supervartotojas';
 $lang['i_problems']            = 'Instaliavimo metu buvo klaidÅ³, kurios pateiktos Å¾emiau. TÄ™sti negalima, kol nebus paÅ¡alintos prieÅ¾astys.';
-$lang['email_signature'] = 'Å is laiÅ¡kas buvo sugeneruotas DokuWiki';
+$lang['email_signature_text'] = 'Å is laiÅ¡kas buvo sugeneruotas DokuWiki
+@DOKUWIKIURL@';
diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php
index a5ac36d7584ec67770ef9a809b3ec0de825177a0..88f8e5f94348f4b3c2485644b06fb635cac91963 100644
--- a/inc/lang/lv/lang.php
+++ b/inc/lang/lv/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Aivars MiÅ¡ka <allefm@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
@@ -333,4 +333,5 @@ $lang['currentns']             = 'PaÅ¡reizÄ“jÄ sadaÄ¼a';
 $lang['searchresult']          = 'MeklÄ“Å¡anas rezultÄti';
 $lang['plainhtml']             = 'TÄ«rs HTML';
 $lang['wikimarkup']            = 'Viki iezÄ«mÄ“Å¡ana valoda';
-$lang['email_signature'] = 'VÄ“stuli nosÅ«tÄ«jusi DokuWiki programma no';
+$lang['email_signature_text'] = 'VÄ“stuli nosÅ«tÄ«jusi DokuWiki programma no
+@DOKUWIKIURL@';
diff --git a/inc/lang/mg/lang.php b/inc/lang/mg/lang.php
index f1f8fcce5f8cc07a6d6fb65ad48148f4c0ff6f46..240133f29e60de42fd3b0189c873690a9285f2f3 100644
--- a/inc/lang/mg/lang.php
+++ b/inc/lang/mg/lang.php
@@ -116,4 +116,5 @@ $lang['js']['del_confirm']= 'Hofafana ilay andalana?';
 
 $lang['searchcreatepage']      = "Raha tsy nahita izay notadiavinao ianao, dia afaka mamorona pejy vaovao avy amin'ny teny nanaovanao fikarohana; Ampiasao ny bokotra ''Hanova ny pejy''.";
 //Setup VIM: ex: et ts=2 :
-$lang['email_signature'] = 'Ity imailaka ity dia navoakan\'ny wiki tao amin\'ny';
+$lang['email_signature_text'] = 'Ity imailaka ity dia navoakan\'ny wiki tao amin\'ny
+@DOKUWIKIURL@';
diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php
index c17d1581bdbbb2b4c46f4b3a53052f1e12707456..4b6d1bd69e912de8c89a9894b96fb094e90ffe04 100644
--- a/inc/lang/mr/lang.php
+++ b/inc/lang/mr/lang.php
@@ -262,4 +262,5 @@ $lang['i_pol1']                = 'à¤¸à¤¾à¤°à¥à¤µà¤œà¤¨à¤¿à¤• à¤µà¤¿à¤•à¥€ ( à¤¸
 $lang['i_pol2']                = 'à¤¬à¤‚à¤¦à¤¿à¤¸à¥à¤¤ à¤µà¤¿à¤•à¥€ ( à¤µà¤¾à¤šà¤¨ , à¤²à¥‡à¤–à¤¨ à¤µ à¤…à¤ªà¤²à¥‹à¤¡à¤šà¥€ à¤ªà¤°à¤µà¤¾à¤¨à¤—à¥€ à¤«à¤•à¥à¤¤ à¤¨à¥‹à¤‚à¤¦à¤£à¥€à¤•à¥ƒà¤¤ à¤¸à¤¦à¤¸à¥à¤¯à¤¾à¤‚à¤¨à¤¾ ) ';
 $lang['i_retry']               = 'à¤ªà¥à¤¨à¥à¤¹à¤¾ à¤ªà¥à¤°à¤¯à¤¤à¥à¤¨';
 $lang['recent_global']         = 'à¤¤à¥à¤®à¥à¤¹à¥€ à¤¸à¤§à¥à¤¯à¤¾ <b>%s</b> à¤¯à¤¾ à¤¨à¥‡à¤®à¤¸à¥à¤ªà¥‡à¤¸ à¤®à¤§à¥€à¤² à¤¬à¤¦à¤² à¤ªà¤¾à¤¹à¤¾à¤¤ à¤†à¤¹à¤¾à¤¤.à¤¤à¥à¤®à¥à¤¹à¥€ <a href="%s">à¤ªà¥‚à¤°à¥à¤£ à¤µà¤¿à¤•à¥€ à¤®à¤§à¤²à¥‡ à¤¬à¤¦à¤² </a> à¤¸à¥à¤¦à¥à¤§à¤¾ à¤ªà¤¾à¤¹à¥‚ à¤¶à¤•à¤¤à¤¾.';
-$lang['email_signature'] = 'à¤¹à¤¾ à¤ˆà¤®à¥‡à¤², à¤¯à¥‡à¤¥à¥€à¤² à¤¡à¥‰à¤•à¥à¤¯à¥à¤µà¤¿à¤•à¤¿à¤¦à¥à¤µà¤¾à¤°à¤¾ à¤†à¤ªà¥‹à¤†à¤ª à¤¤à¤¯à¤¾à¤° à¤•à¥‡à¤²à¤¾ à¤—à¥‡à¤²à¤¾ à¤†à¤¹à¥‡';
+$lang['email_signature_text'] = 'à¤¹à¤¾ à¤ˆà¤®à¥‡à¤², à¤¯à¥‡à¤¥à¥€à¤² à¤¡à¥‰à¤•à¥à¤¯à¥à¤µà¤¿à¤•à¤¿à¤¦à¥à¤µà¤¾à¤°à¤¾ à¤†à¤ªà¥‹à¤†à¤ª à¤¤à¤¯à¤¾à¤° à¤•à¥‡à¤²à¤¾ à¤—à¥‡à¤²à¤¾ à¤†à¤¹à¥‡
+@DOKUWIKIURL@';
diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php
index 79b324f5c5383486c9435ef670a3ef60b52d6c09..fae403f234a9b47ba936f91f6160833ccbd778c7 100644
--- a/inc/lang/ne/lang.php
+++ b/inc/lang/ne/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Saroj Kumar Dhakal <lotusnagarkot@gmail.com>
  * @author Saroj Kumar Dhakal <lotusnagarkot@yahoo.com>
  * @author à¤¸à¤°à¥‹à¤œ à¤¢à¤•à¤¾à¤² <lotusnagarkot@gmail.com>
@@ -201,4 +201,5 @@ $lang['i_pol1']                = 'Public à¤µà¤¿à¤•à¤¿ (à¤ªà¤ à¤¨ à¤¸à¤µà¥ˆà¤•à¤¾
 $lang['i_pol2']                = 'à¤¬à¤¨à¥à¤¦ à¤µà¤¿à¤•à¤¿ (à¤ªà¤ à¤¨ , à¤²à¥‡à¤–à¤¨, à¤…à¤ªà¤²à¥‹à¤¡ ) à¤¦à¤°à¥à¤¤à¤¾ à¤à¤à¤•à¤¾ à¤ªà¥à¤°à¤¯à¥‹à¤—à¤•à¤°à¥à¤¤à¤¾à¤•à¤¾ à¤²à¤¾à¤—à¤¿ à¤®à¤¾à¤¤à¥à¤° à¥¤';
 $lang['i_retry']               = 'à¤ªà¥à¤¨: à¤ªà¥à¤°à¤¯à¤¾à¤¸ à¤—à¤°à¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ';
 $lang['recent_global']         = 'à¤¤à¤ªà¤¾à¤ˆ à¤…à¤¹à¤¿à¤²à¥‡ <b>%s</b> à¤¨à¥‡à¤®à¤¸à¥à¤ªà¥‡à¤¸ à¤à¤¿à¤¤à¥à¤° à¤à¤à¤•à¤¾ à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¨ à¤¹à¥‡à¤°à¥à¤¦à¥ˆà¤¹à¥à¤¨à¥à¤¹à¥à¤¨à¥à¤›à¥¤ à¤¤à¤ªà¤¾à¤ˆ <a href="%s">à¤ªà¥à¤°à¥ˆ à¤µà¤¿à¤•à¤¿à¤®à¤¾ à¤à¤à¤•à¥‹ à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¨ à¤¹à¥‡à¤°à¥à¤¨ à¤¸à¤•à¥à¤¨à¥à¤¹à¥à¤¨à¥à¤›</a>.';
-$lang['email_signature'] = 'à¤¯à¥‹ à¤ªà¤¤à¥à¤° DokuWiki à¤²à¥‡, à¤®à¤¾ à¤¤à¤¯à¤¾à¤° à¤ªà¤¾à¤°à¥‡à¤•à¥‹ à¤¹à¥‹ à¥¤';
+$lang['email_signature_text'] = 'à¤¯à¥‹ à¤ªà¤¤à¥à¤° DokuWiki à¤²à¥‡, à¤®à¤¾ à¤¤à¤¯à¤¾à¤° à¤ªà¤¾à¤°à¥‡à¤•à¥‹ à¤¹à¥‹ à¥¤
+@DOKUWIKIURL@';
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index dd5f6bcd8b71871fd650fb3a4bc2dd39e8265cb3..eb7ef09ad473b6c31a278083db211537fc7398ad 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -361,6 +361,7 @@ $lang['currentns']             = 'Huidige namespace';
 $lang['searchresult']          = 'Zoekresultaat';
 $lang['plainhtml']             = 'Alleen HTML';
 $lang['wikimarkup']            = 'Wiki Opmaak';
-$lang['email_signature']       = 'Deze mail werd gegenereerd door DokuWiki op';
+$lang['email_signature_text']       = 'Deze mail werd gegenereerd door DokuWiki op
+@DOKUWIKIURL@';
 $lang['page_nonexist_rev']     = 'Pagina bestaat niet bij %s. Het is vervolgens aangemaakt bij <a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'Begrijp het niet bij parameter "%s".';
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index 7e37a459b7c7959c3dd3aa0cf97762d2108dd88b..8379923fad9b0252fb3dbc06a09cc23fe530ca74 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -358,5 +358,6 @@ $lang['searchresult']          = 'SÃ¸k i resultat';
 $lang['plainhtml']             = 'Enkel HTML';
 $lang['wikimarkup']            = 'wiki-format';
 $lang['page_nonexist_rev']     = 'Finnes ingen side pÃ¥ %s. Den er derfor laget pÃ¥ <a href="%s">%s</a>';
-$lang['email_signature']       = 'Denne meldingen ble laget av DokuWiki';
+$lang['email_signature_text']       = 'Denne meldingen ble laget av DokuWiki
+@DOKUWIKIURL@';
 $lang['unable_to_parse_date']  = 'Ikke mulig Ã¥ tolke "%s".';
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index 32360230658a34317c81e865165f2ec93d114ac6..d9c90cdf3d2945ab440b651d4a2130c7d5f4cbe5 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -345,4 +345,5 @@ $lang['currentns']             = 'Obecny katalog';
 $lang['searchresult']          = 'Wyniki wyszukiwania';
 $lang['plainhtml']             = 'Czysty HTML';
 $lang['wikimarkup']            = 'Znaczniki';
-$lang['email_signature'] = 'List zostaÅ‚ wygenerowany przez DokuWiki pod adresem';
+$lang['email_signature_text'] = 'List zostaÅ‚ wygenerowany przez DokuWiki pod adresem
+@DOKUWIKIURL@';
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index 69b65f3b224020edcc7a1ef33f8c3aaa8f121fd9..73f00d80601994f549e8bb823736d647729ef6a3 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -359,6 +359,7 @@ $lang['currentns']             = 'DomÃnio atual';
 $lang['searchresult']          = 'Resultado da Busca';
 $lang['plainhtml']             = 'HTML simples';
 $lang['wikimarkup']            = 'MarcaÃ§Ã£o wiki';
-$lang['email_signature']       = 'Essa mensagem foi gerada pelo DokuWiki em';
+$lang['email_signature_text']       = 'Essa mensagem foi gerada pelo DokuWiki em
+@DOKUWIKIURL@';
 $lang['page_nonexist_rev']     = 'PÃ¡gina nÃ£o encontrada em %s. Foi criada posteriormente em <a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'ImpossÃvel analisar em "%s".';
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 5c3562580e4762caf42c7f43ae2115019ff6bff3..890a6fd572152bcdc9f6134d0c030ebb796a9a54 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author JosÃ© Carlos Monteiro <jose.c.monteiro@netcabo.pt>
  * @author JosÃ© Monteiro <Jose.Monteiro@DoWeDo-IT.com>
  * @author Enrico Nicoletto <liverig@gmail.com>
@@ -346,4 +346,5 @@ $lang['plainhtml']             = 'HTML simples';
 $lang['wikimarkup']            = 'Markup de Wiki';
 $lang['page_nonexist_rev']     = 'PÃ¡gina nÃ£o existia no %s. Posteriormente, foi criado em <a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'NÃ£o Ã© possÃvel analisar o parÃ¢metro "%s".';
-$lang['email_signature'] = 'Este email foi gerado por DokuWiki em';
+$lang['email_signature_text'] = 'Este email foi gerado por DokuWiki em
+@DOKUWIKIURL@';
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index 33bbf6b794a493f4ced74bfc759d749abcb107c6..1eb99555e4c37d36ce9adcb1f60301893e17f434 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -333,5 +333,6 @@ $lang['media_perm_read']       = 'Ne pare rÄƒu, dar nu ai suficiente permisiuni
 $lang['media_perm_upload']     = 'Ne pare rÄƒu, dar nu ai suficiente permisiuni pentru a putea Ã®ncÄƒrca fiÈ™iere.';
 $lang['media_update']          = 'ÃŽncarcÄƒ noua versiune';
 $lang['media_restore']         = 'RestaureazÄƒ aceastÄƒ versiune';
-$lang['email_signature']       = 'Acest e-mail a fost generat de DokuWiki la';
+$lang['email_signature_text']       = 'Acest e-mail a fost generat de DokuWiki la
+@DOKUWIKIURL@';
 $lang['searchresult']          = 'Rezultatul cautarii';
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 078fa58c934df4d099c518060c053add90f22e39..0e19dfa6013ac511bbe1c191eb54045d687856dd 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Yuri Pimenov <up@ftpsearch.lv>
  * @author Igor Tarasov <tigr@mail15.com>
  * @author Denis Simakov <akinoame1@gmail.com>
@@ -371,4 +371,5 @@ $lang['plainhtml']             = 'ÐŸÑ€Ð¾ÑÑ‚Ð¾Ð¹ HTML';
 $lang['wikimarkup']            = 'Ð²Ð¸ÐºÐ¸-Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ°';
 $lang['page_nonexist_rev']     = 'ÐÑ‚Ð° ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð° ÐµÑ‰Ñ‘ Ð½Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²Ð¾Ð²Ð°Ð»Ð° %s. ÐžÐ½Ð° Ð±Ñ‹Ð»Ð° ÑÐ¾Ð·Ð´Ð°Ð½Ð° <a href="%s">%s</a>.';
 $lang['unable_to_parse_date']  = 'ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€ "%s".';
-$lang['email_signature'] = 'ÐÑ‚Ð¾ Ð¿Ð¸ÑÑŒÐ¼Ð¾ ÑÐ¾Ð·Ð´Ð°Ð½Ð¾ Â«Ð”Ð¾ÐºÑƒÐ²Ð¸ÐºÐ¸Â» Ñ ÑÐ°Ð¹Ñ‚Ð°';
+$lang['email_signature_text'] = 'ÐÑ‚Ð¾ Ð¿Ð¸ÑÑŒÐ¼Ð¾ ÑÐ¾Ð·Ð´Ð°Ð½Ð¾ Â«Ð”Ð¾ÐºÑƒÐ²Ð¸ÐºÐ¸Â» Ñ ÑÐ°Ð¹Ñ‚Ð°
+@DOKUWIKIURL@';
diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index dd1a5a295cd4bd3d7375a97944b8f5faa62b5c31..0b81f5e3a7d01573e6a98fb19f3ae593a6a3fa5d 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Ondrej Vegh <ov@vsieti.sk> with help of the scholars from Zdruzena stredna skola polygraficka in Bratislava
  * @author Michal Mesko <michal.mesko@gmail.com>
  * @author exusik@gmail.com
@@ -331,4 +331,5 @@ $lang['currentns']             = 'AktuÃ¡lny mennÃ½ priestor';
 $lang['searchresult']          = 'VÃ½sledky hÄ¾adania';
 $lang['plainhtml']             = 'JednoduchÃ© HTML';
 $lang['wikimarkup']            = 'Wiki formÃ¡t';
-$lang['email_signature'] = 'TÃ¡to sprÃ¡va bola zaslanÃ¡ DokuWiki';
+$lang['email_signature_text'] = 'TÃ¡to sprÃ¡va bola zaslanÃ¡ DokuWiki
+@DOKUWIKIURL@';
diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php
index ef082cc6e6f53b8a4887e221691a013fff26a87b..9baa9dd090ecf9d1afa8ecd88b8b66400a82eb46 100644
--- a/inc/lang/sl/lang.php
+++ b/inc/lang/sl/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Jaka Kranjc <lynxlupodian@hotmail.com>
  * @author BoÅ¡tjan SeniÄar <senicar@gmail.com>
  * @author Dejan Levec <webphp@gmail.com>
@@ -331,4 +331,5 @@ $lang['currentns']             = 'Trenutni imenski prostor';
 $lang['searchresult']          = 'Rezultati iskanja';
 $lang['plainhtml']             = 'Zapis HTML';
 $lang['wikimarkup']            = 'Oblikovni jezik Wiki';
-$lang['email_signature'] = 'SporoÄilo je samodejno ustvarjeno na spletiÅ¡Äu';
+$lang['email_signature_text'] = 'SporoÄilo je samodejno ustvarjeno na spletiÅ¡Äu
+@DOKUWIKIURL@';
diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php
index 2bc8dea001c75bd33d2c4009dd0438f8d0b4f36b..6de6af81ec7044f00c5eb801116fdca8a3d76371 100644
--- a/inc/lang/sq/lang.php
+++ b/inc/lang/sq/lang.php
@@ -233,4 +233,5 @@ $lang['days']                  = '%d ditÃ« mÃ« parÃ«';
 $lang['hours']                 = '%d orÃ« mÃ« parÃ«';
 $lang['minutes']               = '%d minuta mÃ« parÃ«';
 $lang['seconds']               = '%d sekonda mÃ« parÃ«';
-$lang['email_signature'] = 'Ky email u gjenerua nga DokuWiki nÃ«';
+$lang['email_signature_text'] = 'Ky email u gjenerua nga DokuWiki nÃ«
+@DOKUWIKIURL@';
diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php
index 3c2cc654241237eefede8476ba9196f030052afd..80f0d36d91865d66d9686b96198aa881b4a15f77 100644
--- a/inc/lang/sr/lang.php
+++ b/inc/lang/sr/lang.php
@@ -258,4 +258,5 @@ $lang['hours']                 = 'ÐŸÑ€Ðµ %d ÑÐ°Ñ‚Ð¸';
 $lang['minutes']               = 'ÐŸÑ€Ðµ %d Ð¼Ð¸Ð½ÑƒÑ‚Ð°';
 $lang['seconds']               = 'ÐŸÑ€Ðµ %d ÑÐµÐºÑƒÐ½Ð´Ð¸';
 $lang['wordblock']             = 'Ð’Ð°ÑˆÐµ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ð½Ð¸ÑÑƒ ÑÐ°Ñ‡ÑƒÐ²Ð°Ð½Ðµ Ñ˜ÐµÑ€ ÑÐ°Ð´Ñ€Ð¶Ðµ Ð·Ð°Ð±Ñ€Ð°ÑšÐµÐ½ Ñ‚ÐµÐºÑÑ‚ (ÑÐ¿Ð°Ð¼)';
-$lang['email_signature'] = 'ÐžÐ²Ñƒ Ð¿Ð¾Ñ€ÑƒÐºÑƒ Ñ˜Ðµ Ð³ÐµÐ½ÐµÑ€Ð¸ÑÐ°Ð¾ DokuWiki sa';
+$lang['email_signature_text'] = 'ÐžÐ²Ñƒ Ð¿Ð¾Ñ€ÑƒÐºÑƒ Ñ˜Ðµ Ð³ÐµÐ½ÐµÑ€Ð¸ÑÐ°Ð¾ DokuWiki sa
+@DOKUWIKIURL@';
diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php
index 721334afd368b62df6d67c8a56cc3b77fa858730..b2bb0734728e65bc33a23a57eb7bb6ba352016be 100644
--- a/inc/lang/sv/lang.php
+++ b/inc/lang/sv/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Joaquim Homrighausen <joho@webbplatsen.se>
  * @author Per Foreby <per@foreby.se>
  * @author Nicklas Henriksson <nicklas[at]nihe.se>
@@ -341,4 +341,5 @@ $lang['media_update']          = 'Ladda upp ny version';
 $lang['media_restore']         = 'Ã…terstÃ¤ll denna version';
 $lang['searchresult']          = 'SÃ¶kresultat';
 $lang['plainhtml']             = 'Ren HTML';
-$lang['email_signature'] = 'Detta meddelande har skapats av DokuWiki pÃ¥';
+$lang['email_signature_text'] = 'Detta meddelande har skapats av DokuWiki pÃ¥
+@DOKUWIKIURL@';
diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php
index 3273faedb8cf9a4dc23bb187d2f6fe95dbcee172..570d92968d0fa18b1f16f49a05656e1ba277e090 100644
--- a/inc/lang/th/lang.php
+++ b/inc/lang/th/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Komgrit Niyomrath <n.komgrit@gmail.com>
  * @author Arthit Suriyawongkul <arthit@gmail.com>
  * @author Kittithat Arnontavilas <mrtomyum@gmail.com>
@@ -242,4 +242,5 @@ $lang['days']                  = '%d à¸§à¸±à¸™à¸à¹ˆà¸à¸™';
 $lang['hours']                 = '%d à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡à¸à¹ˆà¸à¸™';
 $lang['minutes']               = '%d à¸™à¸²à¸—à¸µà¸à¹ˆà¸à¸™';
 $lang['seconds']               = '%d à¸§à¸´à¸™à¸²à¸—à¸µà¸à¹ˆà¸à¸™';
-$lang['email_signature'] = 'à¸ˆà¸”à¸«à¸¡à¸²à¸¢à¸™à¸µà¹‰à¸–à¸¹à¸à¸ªà¸£à¹‰à¸²à¸‡à¸‚à¸¶à¹‰à¸™à¹‚à¸”à¸¢à¹‚à¸”à¸à¸¸à¸§à¸´à¸à¸´à¸—à¸µà¹ˆ';
+$lang['email_signature_text'] = 'à¸ˆà¸”à¸«à¸¡à¸²à¸¢à¸™à¸µà¹‰à¸–à¸¹à¸à¸ªà¸£à¹‰à¸²à¸‡à¸‚à¸¶à¹‰à¸™à¹‚à¸”à¸¢à¹‚à¸”à¸à¸¸à¸§à¸´à¸à¸´à¸—à¸µà¹ˆ
+@DOKUWIKIURL@';
diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php
index 52bece889b6e8ee68ec593abafc0a284ce342b36..49236c5f9e37e73429fe0665e78c60384cd75759 100644
--- a/inc/lang/tr/lang.php
+++ b/inc/lang/tr/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Selim FarsakoÄŸlu <farsakogluselim@yahoo.de>
  * @author AydÄ±n CoÅŸkuner <aydinweb@gmail.com>
  * @author Cihan Kahveci <kahvecicihan@gmail.com>
@@ -339,4 +339,5 @@ $lang['currentns']             = 'GeÃ§erli isimalanÄ±';
 $lang['searchresult']          = 'Arama Sonucu';
 $lang['plainhtml']             = 'YalÄ±n HTML';
 $lang['wikimarkup']            = 'Wiki BiÃ§imlendirmesi';
-$lang['email_signature'] = 'Bu e-posta aÅŸaÄŸÄ±daki DokuWiki tarafÄ±ndan otomatik olarak oluÅŸturulmuÅŸtur';
+$lang['email_signature_text'] = 'Bu e-posta aÅŸaÄŸÄ±daki DokuWiki tarafÄ±ndan otomatik olarak oluÅŸturulmuÅŸtur
+@DOKUWIKIURL@';
diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php
index b1c821f3ee4c6950607442da9b00fe3addc8d393..2fe447b0fbbbf2511bc6276e6905c099a099afb3 100644
--- a/inc/lang/uk/lang.php
+++ b/inc/lang/uk/lang.php
@@ -305,7 +305,8 @@ $lang['hours']                 = '%d Ð³Ð¾Ð´Ð¸Ð½ Ñ‚Ð¾Ð¼Ñƒ';
 $lang['minutes']               = '%d Ñ…Ð²Ð¸Ð»Ð¸Ð½ Ñ‚Ð¾Ð¼Ñƒ';
 $lang['seconds']               = '%d ÑÐµÐºÑƒÐ½Ð´ Ñ‚Ð¾Ð¼Ñƒ';
 $lang['wordblock']             = 'Ð’Ð°ÑˆÑ– Ð·Ð¼Ñ–Ð½Ð¸ Ð½Ðµ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð¾, Ñ‚Ð¾Ð¼Ñƒ Ñ‰Ð¾ Ð²Ð¾Ð½Ð¸ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ð½Ñ– ÑÐº Ñ‚Ð°ÐºÑ–, Ñ‰Ð¾ Ð¼Ñ–ÑÑ‚ÑÑ‚ÑŒ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¸Ð¹ Ñ‚ÐµÐºÑÑ‚(ÑÐ¿Ð°Ð¼).';
-$lang['email_signature']       = 'Ð¦Ðµ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ðµ Ð”Ð¾ÐºÑƒÐ’Ñ–ÐºÑ– Ð·';
+$lang['email_signature_text']       = 'Ð¦Ðµ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ðµ Ð”Ð¾ÐºÑƒÐ’Ñ–ÐºÑ– Ð·
+@DOKUWIKIURL@';
 $lang['media_searchtab']       = 'ÐŸÐ¾ÑˆÑƒÐº';
 $lang['media_file']            = 'Ð¤Ð°Ð¹Ð»';
 $lang['media_viewtab']         = 'ÐžÐ³Ð»ÑÐ´';
diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php
index 02e790bd40fb8f514c39b0c4df1500ade0d522c0..ea1d053a8443ffe85207d1d226d157c156f37836 100644
--- a/inc/lang/vi/lang.php
+++ b/inc/lang/vi/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author James Do <jdo@myrealbox.com>
  */
 $lang['encoding']              = 'utf-8';
@@ -239,4 +239,5 @@ $lang['media_perm_read']       = 'Sorry, báº¡n khÃ´ng Ä‘á»§ quyá»n truy cáºp.'
 $lang['media_perm_upload']     = 'Xin lá»—i, báº¡n khÃ´ng Ä‘á»§ quyá»n Ä‘á»ƒ upload file lÃªn.';
 $lang['media_update']          = 'Táº£i lÃªn phiÃªn báº£n má»›i';
 $lang['media_restore']         = 'Phá»¥c há»“i phiÃªn báº£n nÃ y';
-$lang['email_signature'] = 'Äiá»‡n thÆ° nÃ y táº¡o bá»Ÿi DokuWiki á»Ÿ';
+$lang['email_signature_text'] = 'Äiá»‡n thÆ° nÃ y táº¡o bá»Ÿi DokuWiki á»Ÿ
+@DOKUWIKIURL@';
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index b3364b99d829ebd57bda169e9182d91355be2574..bc49b33dcafbcd69eab4915dc556ffda17aef802 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author chinsan <chinsan@mail2000.com.tw>
  * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
@@ -345,4 +345,5 @@ $lang['currentns']             = 'ç›®å‰çš„å‘½åç©ºé–“';
 $lang['searchresult']          = 'æœå°‹çµæžœ';
 $lang['plainhtml']             = 'ç´” HTML';
 $lang['wikimarkup']            = 'Wiki èªžæ³•æ¨™è¨˜';
-$lang['email_signature'] = 'æœ¬ä¿¡ä»¶ç”±ä»¥ä¸‹ DokuWiki ç¶²ç«™ç”¢ç”Ÿ';
+$lang['email_signature_text'] = 'æœ¬ä¿¡ä»¶ç”±ä»¥ä¸‹ DokuWiki ç¶²ç«™ç”¢ç”Ÿ
+@DOKUWIKIURL@';
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 7a8533815a961a453117872af73da2a8b73c4c39..4ed1116fdfa0aafd902753b9751d03f1e5decb86 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author ZDYX <zhangduyixiong@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
  * @author George Sheraton <guxd@163.com>
@@ -363,4 +363,5 @@ $lang['plainhtml']             = 'çº¯HTML';
 $lang['wikimarkup']            = 'Wiki Markup è¯è¨€';
 $lang['page_nonexist_rev']     = 'é¡µé¢åœ¨ %s ä¸å˜åœ¨ã€‚å®ƒæ›¾åˆ›å»ºäºŽ <a href="%s">%s</a>ã€‚';
 $lang['unable_to_parse_date']  = 'æ— æ³•è§£æžå‚æ•° "%s"ã€‚';
-$lang['email_signature'] = 'æœ¬é‚®ä»¶ç”± DokuWiki è‡ªåŠ¨åˆ›å»º';
+$lang['email_signature_text'] = 'æœ¬é‚®ä»¶ç”± DokuWiki è‡ªåŠ¨åˆ›å»º
+@DOKUWIKIURL@';