From 5faa6f9255391de611d0739e5b3a23e83c78c44a Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org"
 <scott%scott-macgregor.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 24 Jan 2007 02:01:00 +0000
Subject: [PATCH] Bug #362919 --> fix wrapping issues with the remote content
 policy description. Remove unnecessary flex from some of the notification bar
 elements. sr=neil

git-svn-id: svn://10.0.0.236/trunk@218832 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mail/base/content/mailWindowOverlay.js  | 2 +-
 mozilla/mail/base/content/mailWindowOverlay.xul | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/mozilla/mail/base/content/mailWindowOverlay.js b/mozilla/mail/base/content/mailWindowOverlay.js
index 32d808c4265..dca978c0258 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.js
+++ b/mozilla/mail/base/content/mailWindowOverlay.js
@@ -2219,7 +2219,7 @@ var gMessageNotificationBar =
     // update the allow remote content for sender string
     var headerParser = Components.classes["@mozilla.org/messenger/headerparser;1"].getService(Components.interfaces.nsIMsgHeaderParser);
     var emailAddress = headerParser.extractHeaderAddressMailboxes(null, aMsgHdr.author);
-    document.getElementById('allowRemoteContentForAuthorDesc').value = 
+    document.getElementById('allowRemoteContentForAuthorDesc').textContent  = 
       gMessengerBundle.getFormattedString('alwaysLoadRemoteContentForSender', [emailAddress ? emailAddress : aMsgHdr.author]);
     this.updateMsgNotificationBar(kMsgNotificationRemoteImages, true);
   },
diff --git a/mozilla/mail/base/content/mailWindowOverlay.xul b/mozilla/mail/base/content/mailWindowOverlay.xul
index 416b3d01605..e162807416c 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.xul
+++ b/mozilla/mail/base/content/mailWindowOverlay.xul
@@ -2185,25 +2185,22 @@
     <hbox id="phishingBar" class="msgNotificationBar" align="center">
       <image id="phishingBarImage"/>
       <description flex="1" class="msgNotificationBarText">&phishingBarMessage.label;</description>
-      <spacer flex="1"/>
       <button label="&removePhishingBarButton.label;" oncommand="MsgIsNotAScam();"/>
     </hbox>
 
     <hbox id="junkBar" class="msgNotificationBar" align="center">
       <image id="junkBarImage"/>
       <description flex="1" class="msgNotificationBarText">&junkBarMessage.label;</description>
-      <spacer flex="1"/>
       <button label="&junkBarButton.label;" oncommand="JunkSelectedMessages(false);"/>
     </hbox>
 
     <hbox id="remoteContentBar" class="msgNotificationBar" align="center">
       <image id="remoteContentImage"/>
       <vbox flex="1">
-        <description flex="1" class="msgNotificationBarText">&remoteContentMessage.label;</description>
-        <label id="allowRemoteContentForAuthorDesc" class="text-link" flex="1"
+        <description class="msgNotificationBarText">&remoteContentMessage.label;</description>
+        <label id="allowRemoteContentForAuthorDesc" class="text-link"
                onclick="allowRemoteContentForSender();"/>
       </vbox>
-      <spacer flex="1"/>
       <button label="&loadRemoteContentButton1.label;" oncommand="loadMsgWithRemoteContent();"/>
     </hbox>
   </deck>