From 622ea34323f48809588e3175b5a5100ed579b0ed Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 21 Aug 2008 19:06:05 +0000
Subject: [PATCH] Monotone-Parent: 477e32cf5b5583a15d85d9811ea38d461ff7de4e
 Monotone-Revision: 469d156712114bc63eea7b914bbf76d4166fc60e

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-08-21T19:06:05
Monotone-Branch: ca.inverse.sogo
---
 UI/Templates/MailerUI/UIxMailEditor.wox | 2 +-
 UI/WebServerResources/UIxMailEditor.js  | 2 +-
 UI/WebServerResources/generic.js        | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 61caaedff..e8a9bda57 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -28,7 +28,7 @@
     </ul>
   </div>
 
-  <form const:href="send" name="pageform" enctype="multipart/form-data">
+  <form const:href="send" name="pageform" enctype="multipart/form-data" autocomplete="off">
     <div id="attachmentsArea">
       <var:string label:value="Attachments:" />
       <ul id="attachments">
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index 4a3d575e6..a43789c35 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -496,7 +496,7 @@ function initMailEditor() {
 //   textarea.observe("contextmenu", onTextContextMenu);
   textarea.observe("mousedown", onTextMouseDown, true);
 
-  initTabIndex(list, $$("div#subjectRow input").first(), textarea);
+  initTabIndex($("addressList"), $$("div#subjectRow input").first(), textarea);
   onWindowResize(null);
 
   Event.observe(window, "resize", onWindowResize);
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index d71903400..87f1a6588 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -990,11 +990,12 @@ function initCriteria() {
 	searchValue.setStyle({ color: "#aaa" });
       }
       // Set the checkmark to the first option
-      firstOption.addClassName("_chosen");
       if (searchOptions.chosenNode)
 	searchOptions.chosenNode.removeClassName("_chosen");
+      firstOption.addClassName("_chosen");
       searchOptions.chosenNode = firstOption;
     }
+    searchValue.blur();
   }
 }