diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php
index 3daac4590..c07756c17 100644
--- a/application/libraries/MessageLib.php
+++ b/application/libraries/MessageLib.php
@@ -640,7 +640,7 @@ class MessageLib
 						}
 
 						// Using a template for the plain text email body
-						$vorlage = $this->ci->vorlagelib->loadVorlagetext('MessageMailHTML');
+						$vorlage = $this->ci->vorlagelib->loadVorlagetext('MessageMailTXT');
 						if(hasData($vorlage))
 						{
 							$altBody = $this->ci->parser->parse_string(
diff --git a/locale/en-US/lvaliste.php b/locale/en-US/lvaliste.php
index a2530ff48..20df4f7c2 100644
--- a/locale/en-US/lvaliste.php
+++ b/locale/en-US/lvaliste.php
@@ -6,7 +6,7 @@ $this->phrasen['lvaliste/hilfeText']='Legend\n\nDP-Sem: Degree-Program - Semeste
 $this->phrasen['lvaliste/hilfeAnzeigen']='Show Legend';
 
 $this->phrasen['lvaliste/lehrfach']='Subject';
-$this->phrasen['lvaliste/lehrform']='Lehrform';
+$this->phrasen['lvaliste/lehrform']='Course Type';
 $this->phrasen['lvaliste/lvBezeichnung']='Course Title';
 $this->phrasen['lvaliste/lehrfachBezeichnung']='Subject Title';
 $this->phrasen['lvaliste/lektor']='Lector';
diff --git a/rdf/betriebsmittelperson.rdf.php b/rdf/betriebsmittelperson.rdf.php
index d1b40953d..0aa313d2e 100644
--- a/rdf/betriebsmittelperson.rdf.php
+++ b/rdf/betriebsmittelperson.rdf.php
@@ -35,6 +35,8 @@ require_once('../include/organisationseinheit.class.php');
 require_once('../include/person.class.php');
 require_once('../include/betriebsmitteltyp.class.php');
 require_once('../include/betriebsmittel.class.php');
+require_once('../include/wawi_bestellung.class.php');
+require_once('../include/firma.class.php');
 
 if(isset($_GET['person_id']))
 	$person_id = $_GET['person_id'];
@@ -112,6 +114,9 @@ else
 	$typ = $bmt->result[0]->beschreibung;
 	
 	$bm = new betriebsmittel($bmp->betriebsmittel_id);
+	
+	$bestellung = new wawi_bestellung($bm->bestellung_id);
+	$firma =  new firma($bestellung->firma_id);
 
 	echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 	echo '
@@ -133,8 +138,10 @@ else
 		<nummer><![CDATA['.$bmp->nummer.']]></nummer>
 		<nummer2><![CDATA['.$bmp->nummer2.']]></nummer2>
 		<betriebsmitteltyp><![CDATA['.$bmp->betriebsmitteltyp.']]></betriebsmitteltyp>
-		<bestellnummer><![CDATA['.$bm->bestellung_id.']]></bestellnummer>
+		<bestellnummer><![CDATA['.$bestellung->bestell_nr.']]></bestellnummer>
 		<hersteller><![CDATA['.$bm->hersteller.']]></hersteller>
+		<bestellung_id><![CDATA['.$bm->bestellung_id.']]></bestellung_id>
+		<lieferfirma><![CDATA['.$firma->name.']]></lieferfirma>
 		<typ><![CDATA['.$typ.']]></typ>
 		<datum><![CDATA['.date("d.m.Y").']]></datum>
 	</betriebsmittelperson>
diff --git a/system/xsl/uebernahmebestaetigung_0.xsl b/system/xsl/uebernahmebestaetigung_0.xsl
index 5f7ef654d..97fc6c87d 100644
--- a/system/xsl/uebernahmebestaetigung_0.xsl
+++ b/system/xsl/uebernahmebestaetigung_0.xsl
@@ -222,20 +222,35 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 						<text:p text:style-name="P18">Bestellnummer</text:p>
 					</table:table-cell>
 					<table:table-cell table:style-name="Tabelle2.B1" office:value-type="string">
-						<text:p text:style-name="P17"><xsl:value-of select="bestellnummer" /></text:p>
+						<text:p text:style-name="P17">
+							<xsl:choose>
+								<xsl:when test="bestellnummer=''">
+									<xsl:text>-</xsl:text>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="bestellnummer" />
+								</xsl:otherwise>
+							</xsl:choose>
+						</text:p>
+					</table:table-cell>
+				</table:table-row>
+				<table:table-row>
+					<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+						<text:p text:style-name="P18">Firma</text:p>
+					</table:table-cell>
+					<table:table-cell table:style-name="Tabelle2.B1" office:value-type="string">
+						<text:p text:style-name="P17">
+							<xsl:choose>
+								<xsl:when test="lieferfirma=''">
+									<xsl:text>-</xsl:text>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="lieferfirma" />
+								</xsl:otherwise>
+							</xsl:choose>
+						</text:p>
 					</table:table-cell>
 				</table:table-row>
-				<!--add line "firma" only if hersteller is not null-->
-				<xsl:if test="hersteller != ''">
-					<table:table-row>
-						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
-							<text:p text:style-name="P18">Firma</text:p>
-						</table:table-cell>
-						<table:table-cell table:style-name="Tabelle2.B1" office:value-type="string">
-							<text:p text:style-name="P17"><xsl:value-of select="hersteller" /></text:p>
-						</table:table-cell>
-					</table:table-row>
-				</xsl:if>
 				<table:table-row>
 					<table:table-cell table:style-name="Tabelle2.A2" office:value-type="string">
 						<text:p text:style-name="P18">Inventarnummer</text:p>