diff --git a/SOGo/UI/Templates/MailerUI/UIxMailEditorAttach.wox b/SOGo/UI/Templates/MailerUI/UIxMailEditorAttach.wox
index fb002ce2..56192f7b 100644
--- a/SOGo/UI/Templates/MailerUI/UIxMailEditorAttach.wox
+++ b/SOGo/UI/Templates/MailerUI/UIxMailEditorAttach.wox
@@ -12,12 +12,18 @@
     <meta name="author" content="SKYRIX Software AG"/>
     <meta name="robots" content="stop"/>
     
+    <script rsrc:src="generic.js"> </script>
+    <script rsrc:src="UIxMailEditorAttach.js" > </script>
+
     <link type="text/css" rel="stylesheet" rsrc:href="uix.css"/>
     <link type="text/css" rel="stylesheet" rsrc:href="mailer.css"/>
     <link href="mailto:info@skyrix.com" rev="made"/>
   </head>
 
-  <body id="attachment_body" style="background-color: #D4D0C8;">
+  <body id="attachment_body"
+        style="background-color: #D4D0C8;"
+        onload="updateAttachmentListInEditorWindow(this);"
+  >
     <form name="pageform" href="attach" sidInUrl="NO"
           method="POST"
           enctype="multipart/form-data"
@@ -46,7 +52,10 @@
           <tr>
             <td></td>
             <td>
-              <input type="submit" name="submit" value="attach" />
+              <input type="submit"
+                     name="submit"
+                     value="attach"
+              />
               <input type="reset"  value="close" 
                      onclick="window.close()" />
             </td>
@@ -84,6 +93,9 @@
             </div>
           </var:if>
         </div>
+        <span id="attachmentList"
+              style="display: none;"
+        ><var:foreach list="attachmentNames" item="attachmentName"><var:string value="attachmentName" />/</var:foreach></span>
       </div>
     </form>
   </body>
diff --git a/SOGo/UI/Templates/MailerUI/UIxMailToSelection.wox b/SOGo/UI/Templates/MailerUI/UIxMailToSelection.wox
index 63fccb40..fc975482 100644
--- a/SOGo/UI/Templates/MailerUI/UIxMailToSelection.wox
+++ b/SOGo/UI/Templates/MailerUI/UIxMailToSelection.wox
@@ -53,9 +53,9 @@
       </td>
     </tr>
   </table>
-  <var:if condition="isUIxDebugEnabled">
+  
   <span id="addr_addresses" style="visibility: hidden;"><var:foreach list="addressLists" item="addressList"><var:foreach list="addressList" item="address"><span var:id="address" /></var:foreach></var:foreach>
   </span>
 </span>
\ No newline at end of file
diff --git a/SOGo/UI/WebServerResources/UIxMailEditorAttach.js b/SOGo/UI/WebServerResources/UIxMailEditorAttach.js
new file mode 100644
index 00000000..8fbca8c1
--- /dev/null
+++ b/SOGo/UI/WebServerResources/UIxMailEditorAttach.js
@@ -0,0 +1,41 @@
+/*
+ Copyright (C) 2005 SKYRIX Software AG
+ 
+ This file is part of OpenGroupware.org.
+ 
+ OGo is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the
+ Free Software Foundation; either version 2, or (at your option) any
+ later version.
+ 
+ OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public
+ License along with OGo; see the file COPYING.  If not, write to the
+ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+*/
+
+function updateAttachmentListInEditorWindow(sender) {
+  var attachments;
+  
+  attachments = this.getAttachmentNames();
+  window.opener.updateInlineAttachmentList(this, attachments);
+}
+
+function getAttachmentNames() {
+  var e, s, names;
+
+  e = document.getElementById('attachmentList');
+  s = e.innerHTML;
+  /* remove trailing delimiter */
+  s = s.substr(0, s.length - 1);
+  if (s == '') return null;
+
+  /* probably no OS allows '/' in a file name */
+  names = s.split('/');
+  return names;
+}
diff --git a/SOGo/UI/WebServerResources/UIxMailToSelection.js b/SOGo/UI/WebServerResources/UIxMailToSelection.js
index 8a917e5e..1966931b 100644
--- a/SOGo/UI/WebServerResources/UIxMailToSelection.js
+++ b/SOGo/UI/WebServerResources/UIxMailToSelection.js
@@ -118,6 +118,7 @@ function fancyAddRow(shouldEdit, text) {
     input.focus();
     input.select();
   }
+  this.adjustInlineAttachmentListHeight(this);
 }
 
 function addressFieldGotFocus(sender) {
@@ -147,6 +148,7 @@ function removeLastEditedRowIfEmpty() {
   table = this.getTable();
   senderRow = this.findRowWithIndex(idx);
   table.removeChild(senderRow);
+  this.adjustInlineAttachmentListHeight(this);
 }
 
 function findAddressWithIndex(idx) {
diff --git a/SOGo/UI/WebServerResources/mailer.css b/SOGo/UI/WebServerResources/mailer.css
index 25e85643..122e1155 100644
--- a/SOGo/UI/WebServerResources/mailer.css
+++ b/SOGo/UI/WebServerResources/mailer.css
@@ -413,6 +413,13 @@ pre.mailer_plaincontent {
 div#compose_panel div {
   padding: 2px;
 }
+td#compose_leftside {
+  vertical-align:   top;
+}
+
+td#compose_rightside {
+  vertical-align: top;
+}
 
 div#compose_fromline {
 }
@@ -426,6 +433,19 @@ div#compose_internetmarker {
   border-width:     2px;
   border-style:     solid;
 }
+div#compose_attachments {
+}
+div#compose_attachments_list  {
+  width:            100%;
+  height:           100px;
+  background-color: #FFFFFF;
+  font-size:        10px;
+  margin-left:      0px;
+  border-color:     #808080;
+  border-width:     1px;
+  border-style:     solid;
+}
+
 div#compose_subject { 
   border-bottom-color: #808080;
   border-bottom-width: 1;
diff --git a/SOGo/UI/WebServerResources/mailer.js b/SOGo/UI/WebServerResources/mailer.js
index 057f8aea..c41f9a50 100644
--- a/SOGo/UI/WebServerResources/mailer.js
+++ b/SOGo/UI/WebServerResources/mailer.js
@@ -150,6 +150,64 @@ function clickedEditorDelete(sender) {
   return true;
 }
 
+/* X Library, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com). Distributed under the terms of the GNU LGPL */
+/* layout2or3_xlib.js compiled with XC v0.22b, see layout2or3_xlib.txt for contributor copyrights, license info and documentation */
+var xVersion='4.0',xOp7,xOp5or6,xIE4Up,xIE4,xIE5,xNN4,xMoz,xMac,xUA=navigator.userAgent.toLowerCase();if (window.opera){xOp7=(xUA.indexOf('opera 7')!=-1 || xUA.indexOf('opera/7')!=-1);if (!xOp7) xOp5or6=(xUA.indexOf('opera 5')!=-1 || xUA.indexOf('opera/5')!=-1 || xUA.indexOf('opera 6')!=-1 || xUA.indexOf('opera/6')!=-1);}else if (document.all && xUA.indexOf('msie')!=-1) {xIE4Up=parseInt(navigator.appVersion)>=4;xIE4=xUA.indexOf('msie 4')!=-1;xIE5=xUA.indexOf('msie 5')!=-1;}else if (document.layers) {xNN4=true;}xMoz=xUA.indexOf('gecko')!=-1;xMac=xUA.indexOf('mac')!=-1;function xGetElementById(e){if(typeof(e)!='string') return e;if(document.getElementById) e=document.getElementById(e);else if(document.all) e=document.all[e];else e=null;return e;}function xStr(s){for(var i=0; i<arguments.length; ++i){if(typeof(arguments[i])!='string') return false;}return true;}function xScrollLeft(e, bWin){var offset=0;if (!xDef(e) || bWin) {var w = e || window;if(w.document.documentElement && w.document.documentElement.scrollLeft) offset=w.document.documentElement.scrollLeft;else if(w.document.body && xDef(w.document.body.scrollLeft)) offset=w.document.body.scrollLeft;}else {e = xGetElementById(e);if (e && xNum(e.scrollLeft)) offset = e.scrollLeft;}return offset;}function xScrollTop(e, bWin){var offset=0;if (!xDef(e) || bWin) {var w = e || window;if(w.document.documentElement && w.document.documentElement.scrollTop) offset=w.document.documentElement.scrollTop;else if(w.document.body && xDef(w.document.body.scrollTop)) offset=w.document.body.scrollTop;}else {e = xGetElementById(e);if (e && xNum(e.scrollTop)) offset = e.scrollTop;}return offset;}function xHeight(e,h){if(!(e=xGetElementById(e))) return 0;if (xNum(h)) {if (h<0) h = 0;else h=Math.round(h);}else h=-1;var css=xDef(e.style);if(css && xDef(e.offsetHeight) && xStr(e.style.height)) {if(h>=0) {var pt=0,pb=0,bt=0,bb=0;if (document.compatMode=='CSS1Compat') {var gcs = xGetComputedStyle;pt=gcs(e,'padding-top',1);if (pt != null) {pb=gcs(e,'padding-bottom',1);bt=gcs(e,'border-top-width',1);bb=gcs(e,'border-bottom-width',1);}else if(xDef(e.offsetHeight,e.style.height)){e.style.height=h+'px';pt=e.offsetHeight-h;}}h-=(pt+pb+bt+bb);if(isNaN(h)||h<0) return;else e.style.height=h+'px';}h=e.offsetHeight;}else if(css && xDef(e.style.pixelHeight)) {if(h>=0) e.style.pixelHeight=h;h=e.style.pixelHeight;}return h;}function xClientWidth(){var w=0;if(xOp5or6) w=window.innerWidth;else if(document.compatMode == 'CSS1Compat' && !window.opera && document.documentElement && document.documentElement.clientWidth)w=document.documentElement.clientWidth;else if(document.body && document.body.clientWidth)w=document.body.clientWidth;else if(xDef(window.innerWidth,window.innerHeight,document.height)) {w=window.innerWidth;if(document.height>window.innerHeight) w-=16;}return w;}function xClientHeight(){var h=0;if(xOp5or6) h=window.innerHeight;else if(document.compatMode == 'CSS1Compat' && !window.opera && document.documentElement && document.documentElement.clientHeight)h=document.documentElement.clientHeight;else if(document.body && document.body.clientHeight)h=document.body.clientHeight;else if(xDef(window.innerWidth,window.innerHeight,document.width)) {h=window.innerHeight;if(document.width>window.innerWidth) h-=16;}return h;}function xAddEventListener(e,eT,eL,cap){if(!(e=xGetElementById(e))) return;eT=eT.toLowerCase();if((!xIE4Up && !xOp7 /* && !xMoz */) && e==window) {if(eT=='resize') { window.xPCW=xClientWidth(); window.xPCH=xClientHeight(); window.xREL=eL; xResizeEvent(); return; }if(eT=='scroll') { window.xPSL=xScrollLeft(); window.xPST=xScrollTop(); window.xSEL=eL; xScrollEvent(); return; }}var eh='e.on'+eT+'=eL';if(e.addEventListener) e.addEventListener(eT,eL,cap);else if(e.attachEvent) e.attachEvent('on'+eT,eL);else eval(eh);}function xResizeEvent(){if (window.xREL) setTimeout('xResizeEvent()', 250);var cw = xClientWidth(), ch = xClientHeight();if (window.xPCW != cw || window.xPCH != ch) { window.xPCW = cw; window.xPCH = ch; if (window.xREL) window.xREL(); }}function xScrollEvent(){if (window.xSEL) setTimeout('xScrollEvent()', 250);var sl = xScrollLeft(), st = xScrollTop();if (window.xPSL != sl || window.xPST != st) { window.xPSL = sl; window.xPST = st; if (window.xSEL) window.xSEL(); }}function xGetComputedStyle(oEle, sProp, bInt){var s, p = 'undefined';var dv = document.defaultView;if(dv && dv.getComputedStyle){s = dv.getComputedStyle(oEle,'');if (s) p = s.getPropertyValue(sProp);}else if(oEle.currentStyle) {var a = sProp.split('-');sProp = a[0];for (var i=1; i<a.length; ++i) {c = a[i].charAt(0);sProp += a[i].replace(c, c.toUpperCase());}   p = oEle.currentStyle[sProp];}else return null;return bInt ? (parseInt(p) || 0) : p;}function xShow(e) {return xVisibility(e,1);}function xDef(){for(var i=0; i<arguments.length; ++i){if(typeof(arguments[i])=='undefined') return false;}return true;}function xNum(){for(var i=0; i<arguments.length; ++i){if(isNaN(arguments[i]) || typeof(arguments[i])!='number') return false;}return true;}function xVisibility(e, bShow){if(!(e=xGetElementById(e))) return null;if(e.style && xDef(e.style.visibility)) {if (xDef(bShow)) e.style.visibility = bShow ? 'visible' : 'hidden';return e.style.visibility;}return null;}
+
+function showInlineAttachmentList(sender) {
+  var r, l;
+  
+  r = document.getElementById('compose_rightside');
+  r.style.display = 'block';
+  l = document.getElementById('compose_leftside');
+  l.style.width = "67%";
+  this.adjustInlineAttachmentListHeight(sender);
+}
+
+function updateInlineAttachmentList(sender, attachments) {
+  if (!attachments || (attachments.length == 0)) {
+    this.hideInlineAttachmentList(sender);
+    return;
+  }
+  var e, i, count, text;
+  
+  count = attachments.length;
+  text  = "";
+  for (i = 0; i < count; i++) {
+    text = text + attachments[i];
+    text = text + '<br />';
+  }
+
+  e = document.getElementById('compose_attachments_list');
+  e.innerHTML = text;
+  this.showInlineAttachmentList(sender);
+}
+
+function adjustInlineAttachmentListHeight(sender) {
+  var e;
+  
+  e = document.getElementById('compose_rightside');
+  if (e.style.display == 'none') return;
+
+  /* need to lower left size first, because left auto-adjusts to right! */
+  xHeight('compose_attachments_list', 10);
+
+  var leftHeight, rightHeaderHeight;
+  leftHeight        = xHeight('compose_leftside');
+  rightHeaderHeight = xHeight('compose_attachments_header');
+  xHeight('compose_attachments_list', (leftHeight - rightHeaderHeight) - 10);
+}
+
+function hideInlineAttachmentList(sender) {
+  var e;
+  
+//  xVisibility('compose_rightside', false);
+  e = document.getElementById('compose_rightside');
+  e.style.display = 'none';
+  e = document.getElementById('compose_leftside');
+  e.style.width = "100%";
+}
+
 /* addressbook helpers */
 
 function openAnais(sender) {