diff --git a/mail/inc/class.mail_bo.inc.php b/mail/inc/class.mail_bo.inc.php
index 69e63cf7d2..0d7655b792 100644
--- a/mail/inc/class.mail_bo.inc.php
+++ b/mail/inc/class.mail_bo.inc.php
@@ -3981,7 +3981,22 @@ class mail_bo
 							case 'cc':
 							case 'bcc':
 							case 'sender':
+								//error_log(__METHOD__.__LINE__.array2string($env->$v->addresses));
 								$envelope[$v]=$env->$v->addresses;
+								$address = array();
+								foreach ($envelope[$v] as $k => $ad)
+								{
+									if (stripos($ad,'@')===false)
+									{
+										$remember=$k;
+									}
+									else
+									{
+										$address[] = (!is_null($remember)?$envelope[$v][$remember].' ':'').$ad;
+										$remember=null;
+									}
+								}
+								$envelope[$v] = $address;
 								break;
 							case 'date':
 								$envelope[$v]=egw_time::to($env->$v);
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 355d0ba2be..f4522fb8f2 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1589,7 +1589,6 @@ unset($query['actions']);
 		}
 		if (!empty($uid)) $flags = $this->mail_bo->getFlags($uid);
 		$envelope	= $this->mail_bo->getMessageEnvelope($uid, $partID,true);
-
 		$rawheaders	= $this->mail_bo->getMessageRawHeader($uid, $partID);
 		$fetchEmbeddedImages = false;
 		if ($htmlOptions !='always_display') $fetchEmbeddedImages = true;
diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang
index 52526cdafb..10cfdfbe7e 100644
--- a/mail/lang/egw_de.lang
+++ b/mail/lang/egw_de.lang
@@ -89,7 +89,7 @@ force plain text	mail	de	erzwinge Text
 forward as attachment	mail	de	weiterleiten als Anhang
 forward inline	mail	de	Inline weiterleiten
 forward to	mail	de	weiterleiten an
-from	mail	de	von
+from	mail	de	Von
 from(a->z)	mail	de	Von (A->Z)
 from(z->a)	mail	de	Von (Z->A)
 general settings	mail	de	Allgemeine Einstellungen