diff --git a/Layout/default/Emailtemplates/order/int_billing_info.php b/Layout/default/Emailtemplates/order/int_billing_info.php
index 4c5bbd447..c8b57c482 100644
--- a/Layout/default/Emailtemplates/order/int_billing_info.php
+++ b/Layout/default/Emailtemplates/order/int_billing_info.php
@@ -66,33 +66,30 @@ Bauabschnitt: <?=(($order->terminations[0]->building->networksection_id) ? $orde
 Verrechungsstart: <?=date("m", $billing_start)?>/<?=date("Y", $billing_start)?>
 
 
-Rechnungspositionen
-====================
+### Rechnungspositionen
 
-Anzahl       | Produktname                                | Verrechungsperiode | Preis periodisch  | Preis Herstellung
------------------------------------------------------------------------------------------------------------------------
+| Anzahl | Produktname | Verrechungsperiode | Preis periodisch  | Preis Herstellung |
+|--------|-------------|--------------------|-------------------|-------------------|
 <?php foreach($order->products as $op): ?>
 <?php if($op->price_nne > 0.0) $nne_products[] = $op; ?>
-<?=sprintf("%-12s", substr($op->amount,0,12))?> | <?=utf8_encode(sprintf("%-42s", utf8_decode(substr($op->product->name,0,42))))?> | <?=utf8_encode(sprintf("%-18s", utf8_decode(($op->billing_period == 12) ? "Jährlich " : (($op->billing_period == 1) ? "Monatlich" : $op->billing_period."-monatlich")) ))?> | <?=sprintf("EUR %-12s", substr($op->price,0,12))?> | EUR <?=$op->price_setup?>
+<?=$op->amount?> | <?=$op->product->name?> | <?=($op->billing_period == 12) ? "Jährlich " : (($op->billing_period == 1) ? "Monatlich" : $op->billing_period."-monatlich")?> | EUR <?=$op->price?> | EUR <?=$op->price_setup?>
 
------------------------------------------------------------------------------------------------------------------------
 <?php endforeach; ?>
 
 <?php if(count($nne_products)): ?>
 
-Gutschriften
-=============
+### Gutschriften
 
 <?php if($order->terminations[0]->building->network->owner): ?>
 Netzeigentümer: <?=$order->terminations[0]->building->network->owner->getCompanyOrName()?>
-<?php endif; ?>
 
-Anzahl       | Produktname                                | Verrechungsperiode | Bauabschnitt             | NNE
------------------------------------------------------------------------------------------------------------------------
+  <?php endif; ?>
+
+| Anzahl | Produktname | Verrechungsperiode | Bauabschnitt | NNE |
+|--------|-------------|--------------------|--------------|-----|
 <?php foreach($nne_products as $op): ?>
-<?=sprintf("%-12s", substr($op->amount,0,12))?> | <?=utf8_encode(sprintf("%-42s", utf8_decode(substr($op->product->name,0,42))))?> | <?=utf8_encode(sprintf("%-18s", utf8_decode(($op->billing_period == 12) ? "Jährlich " : (($op->billing_period == 1) ? "Monatlich" : $op->billing_period."-monatlich")) ))?> | <?=sprintf("%-24s", substr(($op->termination->building->networksection_id) ? $op->termination->building->networksection->name : "<Kein Bauabschnitt>",0,24))?> | EUR <?=$op->price_nne?>
+<?=$op->amount?> | <?=$op->product->name?> | <?=($op->billing_period == 12) ? "Jährlich " : (($op->billing_period == 1) ? "Monatlich" : $op->billing_period."-monatlich")?> | <?=($op->termination->building->networksection_id) ? $op->termination->building->networksection->name : "<Kein Bauabschnitt>"?> | EUR <?=$op->price_nne?>
 
------------------------------------------------------------------------------------------------------------------------
 <?php endforeach; ?>
 
 <?php endif; // (count($nne_products))?>