diff -r oxid463/out/azure/tpl/email/html/order_cust.tpl changed/out/azure/tpl/email/html/order_cust.tpl
382c382
<                         [{ if $basket->getPaymentCosts() }]
---
>                         [{ if $basket->getPayCostNet() }]
396c396
<                             [{ if $basket->getDelCostVat() }]
---
>                             [{ if $basket->getPayCostVat() }]
409a410,422
>                         [{elseif $basket->getFPaymentCosts()}]
>                             <tr valign="top">
>                                 <td style="padding: 5px; border-bottom: 2px solid #ccc;[{ if $basket->getDelCostVat() }]border-bottom: 1px solid #ddd;[{/if}]">
>                                     <p style="font-family: Arial, Helvetica, sans-serif; font-size: 12px; margin: 0;">
>                                         [{if $basket->getPaymentCosts() >= 0}][{ oxmultilang ident="EMAIL_ORDER_CUST_HTML_PAYMENTCHARGEDISCOUNT1" }][{else}][{ oxmultilang ident="EMAIL_ORDER_CUST_HTML_PAYMENTCHARGEDISCOUNT2" }][{/if}] [{ oxmultilang ident="EMAIL_ORDER_CUST_HTML_PAYMENTCHARGEDISCOUNT3" }]
>                                     </p>
>                                 </td>
>                                 <td style="padding: 5px; border-bottom: 2px solid #ccc;[{ if $basket->getDelCostVat() }]border-bottom: 1px solid #ddd;[{/if}]" align="right">
>                                     <p style="font-family: Arial, Helvetica, sans-serif; font-size: 12px; margin: 0;">
>                                         [{ $basket->getFPaymentCosts() }] [{ $currency->sign}]
>                                     </p>
>                                 </td>
>                             </tr>
648c661
< [{include file="email/html/footer.tpl"}]
\ No newline at end of file
---
> [{include file="email/html/footer.tpl"}]
diff -r oxid463/out/azure/tpl/email/html/order_owner.tpl changed/out/azure/tpl/email/html/order_owner.tpl
346c346
<                                 [{ if $basket->getPaymentCosts() }]
---
>                                 [{ if $basket->getPayCostNet() }]
360c360
<                                     [{ if $basket->getDelCostVat() }]
---
>                                     [{ if $basket->getPayCostVat() }]
373a374,386
>                                 [{elseif $basket->getFPaymentCosts()}]
>                                     <tr valign="top">
>                                         <td style="padding: 5px; border-bottom: 2px solid #ccc;[{ if $basket->getDelCostVat() }]border-bottom: 1px solid #ddd;[{/if}]">
>                                             <p style="font-family: Arial, Helvetica, sans-serif; font-size: 12px; margin: 0;">
>                                                 [{if $basket->getPaymentCosts() >= 0}][{ oxmultilang ident="EMAIL_ORDER_CUST_HTML_PAYMENTCHARGEDISCOUNT1" }][{else}][{ oxmultilang ident="EMAIL_ORDER_CUST_HTML_PAYMENTCHARGEDISCOUNT2" }][{/if}] [{ oxmultilang ident="EMAIL_ORDER_CUST_HTML_PAYMENTCHARGEDISCOUNT3" }]
>                                             </p>
>                                         </td>
>                                         <td style="padding: 5px; border-bottom: 2px solid #ccc;[{ if $basket->getDelCostVat() }]border-bottom: 1px solid #ddd;[{/if}]" align="right">
>                                             <p style="font-family: Arial, Helvetica, sans-serif; font-size: 12px; margin: 0;">
>                                                 [{ $basket->getFPaymentCosts() }] [{ $currency->sign}]
>                                             </p>
>                                         </td>
>                                     </tr>
diff -r oxid463/out/azure/tpl/email/plain/order_cust.tpl changed/out/azure/tpl/email/plain/order_cust.tpl
100c100
< [{ if $basket->getPaymentCosts() }]
---
> [{ if $basket->getPayCostNet() }]
103c103
<   [{ if $basket->getDelCostVat() }]
---
>   [{ if $basket->getPayCostVat() }]
105a106,107
> [{elseif $basket->getFPaymentCosts()}]
>   [{if $basket->getPaymentCosts() >= 0}][{ oxmultilang ident="EMAIL_ORDER_CUST_HTML_PAYMENTCHARGEDISCOUNT1" }][{else}][{ oxmultilang ident="EMAIL_ORDER_CUST_HTML_PAYMENTCHARGEDISCOUNT2" }][{/if}] [{ oxmultilang ident="EMAIL_ORDER_CUST_HTML_PAYMENTCHARGEDISCOUNT3" }] [{ $basket->getFPaymentCosts() }] [{ $currency->name}]
diff -r oxid463/out/azure/tpl/email/plain/order_owner.tpl changed/out/azure/tpl/email/plain/order_owner.tpl
98c98
< [{ if $basket->getPaymentCosts() }]
---
> [{ if $basket->getPayCostNet() }]
101c101
<   [{ if $basket->getDelCostVat() }]
---
>   [{ if $basket->getPayCostVat() }]
103a104,105
> [{elseif $basket->getFPaymentCosts()}]
>   [{if $basket->getPaymentCosts() >= 0}][{ oxmultilang ident="EMAIL_ORDER_CUST_HTML_PAYMENTCHARGEDISCOUNT1" }][{else}][{ oxmultilang ident="EMAIL_ORDER_CUST_HTML_PAYMENTCHARGEDISCOUNT2" }][{/if}] [{ oxmultilang ident="EMAIL_ORDER_CUST_HTML_PAYMENTCHARGEDISCOUNT3" }] [{ $basket->getFPaymentCosts() }] [{ $currency->name}]