diff --git a/app/Model/DreamjobJobMsg.php b/app/Model/DreamjobJobMsg.php
index 0b3e63d..c58c1e1 100644
--- a/app/Model/DreamjobJobMsg.php
+++ b/app/Model/DreamjobJobMsg.php
@@ -58,10 +58,10 @@ class DreamjobJobMsg extends AppModel {
         if ($result) {
             $app = $this->DreamjobJobApplication->find('first', array('conditions' => array('DreamjobJobApplication.id' => $result["DreamjobJobMsg"]["application_id"])));
 
-            if ($this->fromcompany)
-                $result = self::sendMail($app['WorkerUser']['mail'], $this->application_id, array('User' => $app['WorkerUser'], 'AppUser' => $app['AppUserWorker']),true);
+            if ($result["DreamjobJobMsg"]['fromcompany'])
+                $result = self::sendMail($app['WorkerUser']['mail'], $result["DreamjobJobMsg"]['application_id'], array('User' => $app['WorkerUser'], 'AppUser' => $app['AppUserWorker']),true);
             else
-                $result = self::sendMail($app['User']['mail'], $this->application_id, array('DreamjobCompany' => $app['DreamjobCompany']));
+                $result = self::sendMail($app['User']['mail'], $result["DreamjobJobMsg"]['application_id'], array('DreamjobCompany' => $app['DreamjobCompany']));
         }
         if ($result) {
             $dataSource->commit();
diff --git a/app/View/Emails/html/job_application_msg_company.ctp b/app/View/Emails/html/job_application_msg_company.ctp
index 9f1b74b..bc92790 100644
--- a/app/View/Emails/html/job_application_msg_company.ctp
+++ b/app/View/Emails/html/job_application_msg_company.ctp
@@ -1,4 +1,4 @@
-Sehr geehrter <?=$data['DreamjobCompany']['owner'];?>!<br/><br/>
+Sehr geehrte/r <?=$data['DreamjobCompany']['owner'];?>!<br/><br/>
 Sie haben eine Nachricht von einem Bewerber erhalten<br/><br/>
 Sehe diese unter folgendem Link ein:<br/>
 <?=$this->Html->link('Link',array('controller'=>'job','action'=>'applicationGet','id'=>$id,'ages'=>'ages','full_base' => true));?>
@@ -15,4 +15,4 @@ Ausgezeichnete Leistungen, bester Service: <br/>
 Herzlich willkommen bei der DAK-Gesundheit.<br/>
 <a href="#"><img src="cid:dak.jpg"></a><br/><br/>
 <a href="https://dream-job.eu/agb">AGBs</a><br/>
-<a href="https://dream-job.eu/impressum">Impressum</a>
\ No newline at end of file
+<a href="https://dream-job.eu/impressum">Impressum</a>
diff --git a/app/View/Emails/text/job_application_msg_company.ctp b/app/View/Emails/text/job_application_msg_company.ctp
index 1cdb60f..5651bfe 100644
--- a/app/View/Emails/text/job_application_msg_company.ctp
+++ b/app/View/Emails/text/job_application_msg_company.ctp
@@ -1,9 +1,12 @@
-Sehr geehrter <?=$data['DreamjobCompany']['owner'];?>!
+Sehr geehrte/r <?=$data['DreamjobCompany']['owner'];?>!
 
 Sie haben eine Nachricht von einem Bewerber erhalten.
 
 Sehe diese unter folgendem Link ein:
-<?=$this->Html->url(array('controller'=>'job','action'=>'applicationGet','id'=>$id,'ages'=>'ages'),true);?>
+<?php
+	$url = $this->Html->url(array('controller'=>'job','action'=>'applicationGet','id'=>$id,'ages'=>'ages','full_base' => true) );
+	echo $this->Html->link($url, $url);
+?>
 
 ---
 Bei Fragen wenden Sie sich gerne an unser Team:
@@ -26,4 +29,4 @@ Ausgezeichnete Leistungen, bester Service:
 Herzlich willkommen bei der DAK-Gesundheit.
 
 https://dream-job.eu/agb
-https://dream-job.eu/impressum
\ No newline at end of file
+https://dream-job.eu/impressum
diff --git a/app/View/Emails/text/job_application_msg_worker.ctp b/app/View/Emails/text/job_application_msg_worker.ctp
index 88e0c48..3e54653 100644
--- a/app/View/Emails/text/job_application_msg_worker.ctp
+++ b/app/View/Emails/text/job_application_msg_worker.ctp
@@ -3,7 +3,10 @@ Hallo <?=$data['AppUser']['first_name']." ".$data['AppUser']['last_name'];?>!
 Du hast eine Nachricht von einem Unternehmen erhalten.
 
 Sehe diese unter folgendem Link ein:
-<?=$this->Html->url(array('controller'=>'job','action'=>'applicationGet','id'=>$id,'ages'=>'ages'),true);?>
+<?php
+	$url = $this->Html->url(array('controller'=>'job','action'=>'applicationGet','id'=>$id,'ages'=>'ages','full_base' => true) );
+	echo $this->Html->link($url, $url);
+?>
 
 ---
 Bei Fragen wenden Sie sich gerne an unser Team:
@@ -21,4 +24,4 @@ Ausgezeichnete Leistungen, bester Service:
 Herzlich willkommen bei der DAK-Gesundheit.
 
 https://dream-job.eu/agb
-https://dream-job.eu/impressum
\ No newline at end of file
+https://dream-job.eu/impressum
diff --git a/app/View/Pdf/application.ctp b/app/View/Pdf/application.ctp
index d3242e7..3161f72 100644
--- a/app/View/Pdf/application.ctp
+++ b/app/View/Pdf/application.ctp
@@ -88,7 +88,8 @@ foreach($application['Page'] as $page){
 			if($page['id'] == $pg['page_ptr_id'])
 				$pageType=$pg;
 		}
-		$tcpdf->writeHTMLCell(0,235,10,35, $pageType['text'], $dev,0,false,true,'L');
+		//$tcpdf->writeHTMLCell(0,235,10,35, $pageType['text'], $dev,0,false,true,'L');
+		$tcpdf->writeHTML($pageType['text']);
 	}else{
 		$tcpdf->Image(WWW_ROOT.DS.'uploads'.DS.$pageType['image'],0,35,0,235,'','','','',300,'C');
 	}
diff --git a/app/View/Pdf/profil.ctp b/app/View/Pdf/profil.ctp
index c72ec13..ae8f5e2 100644
--- a/app/View/Pdf/profil.ctp
+++ b/app/View/Pdf/profil.ctp
@@ -71,7 +71,8 @@ foreach($WORKER['DreamjobPageInh'] as $page){
 			if($page['id'] == $pg['DreamjobPageInh']['id'])
 				$pageType=$pg;
 		}
-		$tcpdf->writeHTMLCell(0,235,10,35, $pageType['DreamjobPageText']['text'], $dev,0,false,true,'L');
+		//$tcpdf->writeHTMLCell(0,235,10,35, $pageType['DreamjobPageText']['text'], $dev,0,false,true,'L');
+		$tcpdf->writeHTML($pageType['DreamjobPageText']['text']);
 	}else{
 		$tcpdf->Image(WWW_ROOT.DS.'uploads'.DS.$pageType['DreamjobPageImage']['image'],0,35,0,235,'','','','',300,'C');
 	}
diff --git a/app/webroot/js/dreamjob.js b/app/webroot/js/dreamjob.js
index 42ad411..b02f569 100755
--- a/app/webroot/js/dreamjob.js
+++ b/app/webroot/js/dreamjob.js
@@ -32,13 +32,15 @@ var global_load = null;
         function stopLoad(e) {
             if (!e)
                 e = window.event;
-            if (e.preventDefault)
-                e.preventDefault();
-            if (e.stopPropagation) {
-                e.stopPropagation();
-            } else {
-                e.cancelBubble = true;
-            }
+			if (e){
+		        if (e.preventDefault)
+		            e.preventDefault();
+		        if (e.stopPropagation) {
+		            e.stopPropagation();
+		        } else {
+		            e.cancelBubble = true;
+		        }
+			}
         }
         function event(where) {
             /* Hotfix Ticket: 215*/