From 78ac3c734da5e4650a1896a4a32fad95660256c8 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 2 Aug 2006 22:43:17 +0000
Subject: [PATCH] Monotone-Parent: 4d94487c312c73f76cac4c9cbbfef71966a3b768
 Monotone-Revision: 7cc283107984b0e4e73a623772894e8cc7db2e29

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-08-02T22:43:17
Monotone-Branch: ca.inverse.sogo
---
 UI/MailerUI/Toolbars/SOGoMailObject.toolbar | 12 ++++++++----
 UI/WebServerResources/MailerUI.js           |  4 ++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/UI/MailerUI/Toolbars/SOGoMailObject.toolbar b/UI/MailerUI/Toolbars/SOGoMailObject.toolbar
index c32e7d60d..8c9281992 100644
--- a/UI/MailerUI/Toolbars/SOGoMailObject.toolbar
+++ b/UI/MailerUI/Toolbars/SOGoMailObject.toolbar
@@ -17,17 +17,20 @@
   ),
 
   ( // second group
-    { link = "reply"; 
+    { link = "reply";
+      onclick = "return onMenuReplyToSender(event);";
       isSafe   = NO;
       image = "tb-mail-reply-flat-24x24.png";
       cssClass = "tbicon_reply";    label = "Reply";     },
 
-    { link = "replyall"; 
+    { link = "replyall";
+      onclick = "return onMenuReplyToAll(event);";
       isSafe   = NO;
       image = "tb-mail-replyall-flat-24x24.png";
       cssClass = "tbicon_replyall"; label = "Reply All"; },
 
-    { link = "forward"; 
+    { link = "forward";
+      onclick = "return onMenuForwardMessage(event);";
       isSafe   = NO;
       image = "tb-mail-forward-flat-24x24.png";
       cssClass = "tbicon_forward";  label = "Forward";   },
@@ -36,7 +39,8 @@
   ( // third group
     { link     = "delete";
       isSafe = NO;
-      enabled  = showMarkDeletedButton;
+      onclick = "return onMenuDeleteMessage(event);";
+//       enabled  = showMarkDeletedButton;
       image = "tb-mail-delete-flat-24x24.png";
       cssClass = "tbicon_delete"; label = "Delete"; },
     { link = "#";
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index e5665bc11..93d6054a6 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -975,18 +975,22 @@ function onMenuOpenMessage(event)
 function onMenuReplyToSender(event)
 {
   openMessageWindowsForSelection(null, 'reply');
+
+  return false;
 }
 
 function onMenuReplyToAll(event)
 {
   openMessageWindowsForSelection(null, 'replyall');
 
+  return false;
 }
 
 function onMenuForwardMessage(event)
 {
   openMessageWindowsForSelection(null, 'forward');
 
+  return false;
 }
 
 function onMenuDeleteMessage(event)