diff --git a/mail/inc/class.mail_bo.inc.php b/mail/inc/class.mail_bo.inc.php
index 49ce008fcf..f04288b781 100644
--- a/mail/inc/class.mail_bo.inc.php
+++ b/mail/inc/class.mail_bo.inc.php
@@ -1189,7 +1189,7 @@ class mail_bo
 						{
 							if ($k==0) continue;
 							//error_log(__METHOD__.__LINE__."-> $k:".array2string($add));
-							$retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki]['address'] = self::decode_header($add);
+							$retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki] = self::decode_header($add);
 							//error_log(__METHOD__.__LINE__.array2string($retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki]));
 							$ki++;
 						}
@@ -1200,7 +1200,7 @@ class mail_bo
 					foreach($headerObject['CC'] as $k => $add)
 					{
 						//error_log(__METHOD__.__LINE__."-> $k:".array2string($add));
-						$retValue['header'][$sortOrder[$uid]]['cc_addresses'][$ki]['address'] = self::decode_header($add);
+						$retValue['header'][$sortOrder[$uid]]['cc_addresses'][$ki] = self::decode_header($add);
 						//error_log(__METHOD__.__LINE__.array2string($retValue['header'][$sortOrder[$uid]]['additional_to_addresses'][$ki]));
 						$ki++;
 					}
diff --git a/mail/js/app.js b/mail/js/app.js
index 1897322236..7ca2a999c5 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -551,16 +551,15 @@ app.classes.mail = AppJS.extend(
 		var buttons = [
 			{text: this.egw.lang("Close"), id:"close"}
 		];
-		et2_dialog.show_dialog(function(_button_id)
-		{
-			switch(_button_id)
-			{
-				case 'close':
-				default:
-					break;
-			}
-		},this.egw.lang("text one"),
-		dataElem.data.subject, {}, buttons, et2_dialog.WARNING_MESSAGE);
+		var dialog = et2_createWidget("dialog",{
+			// If you use a template, the second parameter will be the value of the template, as if it were submitted.
+			callback: function(button_id, value) {},
+			buttons: buttons,
+			title: dataElem.data.subject,
+			template:"/egroupware/mail/templates/default/displayAllAdresses.xet",
+			value: { content: {displayallAdresses:[{type:this.egw.lang('to'),address:JSON.parse(dataElem.data.additionaltoaddress)[0]}]}, sel_options: {}}
+		});
+
 	},
 
 	mail_setMailBody: function(content) {
diff --git a/mail/templates/default/displayAllAdresses.xet b/mail/templates/default/displayAllAdresses.xet
new file mode 100644
index 0000000000..2140f24930
--- /dev/null
+++ b/mail/templates/default/displayAllAdresses.xet
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!-- $Id$ -->
+<overlay>
+	<template id="mail.displayAllAdresses" template="" lang="" group="0" version="1.9.001">
+		<grid disabled="@no_griddata" id="displayallAdresses">
+		  <columns>
+		   <column width="10%" />
+		   <column width="80%" />
+		  </columns>
+		  <rows>
+		   <row >
+			<description id="${row}[type]" />
+			<url-email align="right" id="${row}[address]" readonly='true'/>
+		   </row>
+		  </rows>
+		</grid>
+	</template>
+</overlay>