diff --git a/Layout/default/Emailtemplates/order/fileupload/voicenumber_porting.php b/Layout/default/Emailtemplates/order/fileupload/voicenumber_porting.php
index 743845049..38ce7a130 100644
--- a/Layout/default/Emailtemplates/order/fileupload/voicenumber_porting.php
+++ b/Layout/default/Emailtemplates/order/fileupload/voicenumber_porting.php
@@ -2,16 +2,29 @@
 
 $customer_string = str_replace(["\r","\n"], " ", $order->owner->getCompanyOrName())." [".$order->owner->customer_number."]";
 
-$subject = "Neue Rufnummerportierung ($customer_string)";
+$subject = "Rufnummernmitnahme $customer_string";
 
 $this->setReturnValue([
   'subject' => $subject,
-  'to' => "portierung@xinon.at",
-  'from_email' => TT_OUTGOING_EMAIL,
-  'from_email_name' => TT_OUTGOING_EMAIL_NAME
+  'to' => "workspace@xinon.at",
+  'from_email' => "workspace.admin@xinon.at",
+  'from_email_name' => "thetool"
 ]);
 
 ?>
+
+
+project: portierung
+type: Portierung
+status: Neu
+priority: Standard
+Kundennummer: <?=$order->owner->customer_number?>
+
+Kundenname: <?=str_replace("\n", "", str_replace("\r\n", " ", $order->owner->getCompanyOrName()))?>
+
+Telefon: <?=($order->owner->phone) ? $order->owner->phone : "null"?>
+
+
 <?=str_replace(["\r","\n"], " ", $file->creator->name)?> hat soeben eine Rufnummerportierung für den Kunden <?=$customer_string?> angelegt - siehe Dokument im Anhang. Bitte um Prüfung des Herstellungstermins und Einreichung.
 
 TheTool OrderROBOT (-;
diff --git a/Layout/default/Emailtemplates/order/int_billing_info.php b/Layout/default/Emailtemplates/order/int_billing_info.php
index c8b57c482..a60429316 100644
--- a/Layout/default/Emailtemplates/order/int_billing_info.php
+++ b/Layout/default/Emailtemplates/order/int_billing_info.php
@@ -35,7 +35,7 @@
       'subject' => $subject,
                     
       'from_email' => "workspace.admin@xinon.at",
-      'from_email_name' => "Xinon Workspace Einkipper"
+      'from_email_name' => "thetool"
   ]);
   
   $nne_products = [];
@@ -57,7 +57,7 @@ Kundennummer: <?=$order->owner->customer_number?>
 
 Kundenname: <?=str_replace("\n", "", str_replace("\r\n", " ", $order->owner->getCompanyOrName()))?>
 
-Telefon: <?=$order->owner->phone?>
+Telefon: <?=($order->owner->phone) ? $order->owner->phone : "null"?>
 
 Netzgebiet: <?=$order->terminations[0]->building->network->name?>