From aefb13557e34863dd1e0f6b044b8d52cdddbad0c Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 2 Nov 2007 20:12:41 +0000
Subject: [PATCH] Monotone-Parent: 0cead9c9acf2f6167ebb5f33124979426871bdf9
 Monotone-Revision: e5f7f608aed299b1e250e132175bf84ba150127c

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-02T20:12:41
Monotone-Branch: ca.inverse.sogo
---
 UI/Templates/MailerUI/UIxMailMainFrame.wox | 8 ++++++++
 UI/Templates/MailerUI/UIxMailPopupView.wox | 7 +++++++
 UI/Templates/MailerUI/UIxMailView.wox      | 7 -------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 2356d37b5..669cb7fcd 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -148,6 +148,14 @@
     </ul>
   </div>
 
+  <div class="menu" id="addressMenu">
+    <ul>
+      <li id="add_to_addressbook"><var:string label:value="Add to Address Book..."/></li>
+      <li id="compose_mailto"><var:string label:value="Compose Mail To"/></li>
+      <li id="create_filter"><var:string label:value="Create Filter From Message..."/></li>
+    </ul>
+  </div>
+
   <div id="leftPanel">
     <div class="titlediv"><var:string label:value="Folders" /></div>
     <div id="folderTreeContent"><!-- space --></div>
diff --git a/UI/Templates/MailerUI/UIxMailPopupView.wox b/UI/Templates/MailerUI/UIxMailPopupView.wox
index 2f7f01b4d..d5c07e648 100644
--- a/UI/Templates/MailerUI/UIxMailPopupView.wox
+++ b/UI/Templates/MailerUI/UIxMailPopupView.wox
@@ -10,4 +10,11 @@
     <span id="messageContent">
       <var:component className="UIxMailView" />
     </span>
+    <div class="menu" id="addressMenu">
+      <ul>
+        <li id="add_to_addressbook"><var:string label:value="Add to Address Book..."/></li>
+        <li id="compose_mailto"><var:string label:value="Compose Mail To"/></li>
+        <li id="create_filter"><var:string label:value="Create Filter From Message..."/></li>
+      </ul>
+    </div>
    </var:component>
diff --git a/UI/Templates/MailerUI/UIxMailView.wox b/UI/Templates/MailerUI/UIxMailView.wox
index 68d3e7434..74f563783 100644
--- a/UI/Templates/MailerUI/UIxMailView.wox
+++ b/UI/Templates/MailerUI/UIxMailView.wox
@@ -74,11 +74,4 @@
         bodyInfo="clientObject.bodyStructure" />
     </div>
 
-    <div class="menu" id="addressMenu">
-      <ul>
-        <li id="add_to_addressbook"><var:string label:value="Add to Address Book..."/></li>
-        <li id="compose_mailto"><var:string label:value="Compose Mail To"/></li>
-        <li id="create_filter"><var:string label:value="Create Filter From Message..."/></li>
-      </ul>
-    </div>
   </container>