From b3d1ffe1eafb576b8c5ff847ff2c29fe977e2f9f Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 11 Feb 2014 17:27:40 +0000
Subject: [PATCH] Add header and footer to mail subsciption popup window, and
 remove unneccessary <description id=msg> widget because messages are all
 handled by egw_message

---
 mail/templates/default/subscribe.xet | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/mail/templates/default/subscribe.xet b/mail/templates/default/subscribe.xet
index 5dac781ab6..4dd031fcd9 100755
--- a/mail/templates/default/subscribe.xet
+++ b/mail/templates/default/subscribe.xet
@@ -2,23 +2,27 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="mail.subscribe" template="" lang="" group="0" version="1.9.001">
-		<hbox>
-			<description id="msg" class="message"/>
-		</hbox>
-		<grid>
+		<grid width="100%">
 			<columns>
+				<column width="100%"/>
 				<column/>
 			</columns>
 			<rows>
+				<row class="th dialog-header" height="28">
+					<menulist>
+						<description value="Mail Account"/>
+						<menupopup id="mailaccount" onchange="app.mail.submitOnChange"/>
+					</menulist>
+				</row>
 				<row>
-					<groupbox>
+					<box scrolling="auto">
 						<caption label="Folders"/>
 						<tree id="foldertree" onclick=""  multiple="true"/>
-					</groupbox>
+					</box>
 				</row>
 			</rows>
 		</grid>
-		<hbox>
+		<hbox  class="dialog-footer-toolbar">
 			<button statustext="Saves this ACL" label="Save" id="button[save]"/>
 			<button statustext="Applies the changes made" label="Apply" id="button[apply]"/>
 			<button label="Cancel" id="button[cancel]"/>