diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 002f423195..5fcb5f4df2 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -2142,11 +2142,13 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
 						{
 							$windowName = 'displayEvent_'. $rowID;
 							$reg2 = egw_link::get_registry('calendar','view_popup');
+							$attachmentHTML[$key]['popup']=(!empty($reg2) ? $reg2 : $reg);
 						}
 						if (strtoupper($value['mimeType'])=='TEXT/X-VCARD' || strtoupper($value['mimeType'])=='TEXT/VCARD')
 						{
 							$windowName = 'displayContact_'. $rowID;
 							$reg2 = egw_link::get_registry('addressbook','add_popup');
+							$attachmentHTML[$key]['popup']=(!empty($reg2) ? $reg2 : $reg);
 						}
 						// apply to action
 						list($width,$height) = explode('x',(!empty($reg2) ? $reg2 : $reg));
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 8de96bb2af..ce85a64f9b 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -72,7 +72,7 @@
 								<description id="${row}[partID]" />
 								<description id="${row}[type]" />
 								<description id="${row}[winmailFlag]" />
-								<description class="useEllipsis et2_link" id="${row}[filename]" expose_view="true" mime="$row_cont[type]" no_lang="1" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
+								<description class="useEllipsis et2_link" id="${row}[filename]" extra_link_target="$row_cont[windowName]" extra_link_popup="$row_cont[popup]" expose_view="true" mime="$row_cont[type]" no_lang="1" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
 								<description align="right" id="${row}[size]" />
 								<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachment"/>
 								<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index e6fa4b6e00..ea75bece04 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -51,7 +51,7 @@
 								<description id="${row}[partID]" />
 								<description id="${row}[type]" />
 								<description id="${row}[winmailFlag]" />
-								<description class="et2_link useEllipsis" id="${row}[filename]" no_lang="1" expose_view="true" mime="$row_cont[type]" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
+								<description class="et2_link useEllipsis" id="${row}[filename]" extra_link_target="$row_cont[windowName]" extra_link_popup="$row_cont[popup]" no_lang="1" expose_view="true" mime="$row_cont[type]" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
 								<description align="right" id="${row}[size]"/>
 								<buttononly id="${row}[save]" image="fileexport" onclick="app.mail.saveAttachment"/>
 								<buttononly id="${row}[saveAsVFS]" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>