From 2f23567109f9ca3783564dbbeae9d0cea0ee924f Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 16 Nov 2007 23:02:21 +0000
Subject: [PATCH] Monotone-Parent: 92ec8d2f76cb2878fe2ef2c11944485cc9b5127f
 Monotone-Revision: fdaa9bb9f2456732024f9c342a2ebc46376564c1

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-16T23:02:21
Monotone-Branch: ca.inverse.sogo
---
 UI/MailerUI/UIxMailToSelection.m            | 2 +-
 UI/WebServerResources/UIxMailEditor.css     | 2 +-
 UI/WebServerResources/UIxMailEditor.js      | 8 +++-----
 UI/WebServerResources/UIxMailToSelection.js | 5 ++---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/UI/MailerUI/UIxMailToSelection.m b/UI/MailerUI/UIxMailToSelection.m
index 71c09f18b..c241105eb 100644
--- a/UI/MailerUI/UIxMailToSelection.m
+++ b/UI/MailerUI/UIxMailToSelection.m
@@ -178,7 +178,7 @@ static NSArray *headers = nil;
   NSMutableArray *ma;
   
   ma = [NSMutableArray arrayWithCapacity:3];
-  if ([to isNotNull])
+  if ([to isNotNull] && [to count] > 0)
     [ma addObject: to];
   if ([cc isNotNull])
     [ma addObject: cc];
diff --git a/UI/WebServerResources/UIxMailEditor.css b/UI/WebServerResources/UIxMailEditor.css
index bf46f21a1..328b8a4cd 100644
--- a/UI/WebServerResources/UIxMailEditor.css
+++ b/UI/WebServerResources/UIxMailEditor.css
@@ -151,4 +151,4 @@ UL#attachments LI IMG
   right: 0em;
   bottom: 0em;
   top: 13em;
-  width: 100%; }
+  width: 99%; }
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index 5876bf275..54846025a 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -4,11 +4,9 @@ function onContactAdd() {
   var selector = null;
   var selectorURL = '?popup=YES&selectorId=mailer-contacts';
  
-  urlstr = ApplicationBaseURL;
-  if (urlstr[urlstr.length-1] != '/')
-    urlstr += '/';
-  urlstr += ("../../" + UserLogin + "/Contacts/"
-             + contactSelectorAction + selectorURL);
+  urlstr = ApplicationBaseURL 
+    + "../Contacts/"
+    + contactSelectorAction + selectorURL;
   var w = window.open(urlstr, "Addressbook",
                       "width=640,height=400,resizable=1,scrollbars=0");
   w.selector = selector;
diff --git a/UI/WebServerResources/UIxMailToSelection.js b/UI/WebServerResources/UIxMailToSelection.js
index df7c1a68c..4593693d8 100644
--- a/UI/WebServerResources/UIxMailToSelection.js
+++ b/UI/WebServerResources/UIxMailToSelection.js
@@ -219,9 +219,8 @@ function hasRecipients() {
   var count;
   
   count = this.getAddressCount();
-  if (count > 0)
-    return true;
-  return false;
+
+  return (count > 0)
 }
 
 /* addressbook helpers */