diff --git a/controllers/HtmlmailController.inc b/controllers/HtmlmailController.inc
index e36da004..72e9dede 100644
--- a/controllers/HtmlmailController.inc
+++ b/controllers/HtmlmailController.inc
@@ -34,8 +34,8 @@
 			parent::preFilter($request, $response);
 			
 			
-			// Set application URL
-			$this->set('url', \nre\configs\AppConfig::$app['url']);
+			// Set linker
+			$this->set('linker', ($request instanceof \hhu\z\requests\MailRequest && !is_null($request->getLinker())) ? $request->getLinker() : null);
 		}
 		
 		
diff --git a/controllers/TextmailController.inc b/controllers/TextmailController.inc
index 563c6bd6..a35976cd 100644
--- a/controllers/TextmailController.inc
+++ b/controllers/TextmailController.inc
@@ -35,8 +35,8 @@
 			parent::preFilter($request, $response);
 			
 			
-			// Set application URL
-			$this->set('url', \nre\configs\AppConfig::$app['url']);
+			// Set linker
+			$this->set('linker', ($request instanceof \hhu\z\requests\MailRequest && !is_null($request->getLinker())) ? $request->getLinker() : null);
 		}
 		
 		
diff --git a/views/htmlmail/htmlmail.tpl b/views/htmlmail/htmlmail.tpl
index d6f2a4c0..ea9da24c 100644
--- a/views/htmlmail/htmlmail.tpl
+++ b/views/htmlmail/htmlmail.tpl
@@ -11,7 +11,9 @@
 		<?=$intermediate?>
 	</p>
 	
-	<p>– <a href="<?=$url?>"><?=$appname?></a></p>
+	<p>–
+		<?php if(!is_null($linker)) : ?><a href="<?=$linker->link(array(),0,true,null,false,null,true)?>"><?=$appname?></a><?php else : ?><?=$appname?><?php endif ?>
+	</p>
 </body>
 
 </html>
diff --git a/views/textmail/textmail.tpl b/views/textmail/textmail.tpl
index f6836506..57b9f458 100644
--- a/views/textmail/textmail.tpl
+++ b/views/textmail/textmail.tpl
@@ -5,4 +5,4 @@
 
 – <?=$appname?>
 
-<?=$url?>
+<?php if(!is_null($linker)) : ?><?=$linker->link(array(),0,true,null,false,null,true)?><?php endif ?>