diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-offline.xul b/mozilla/mailnews/base/prefs/resources/content/pref-offline.xul
index 9670fa1687e..2777102a70b 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-offline.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-offline.xul
@@ -60,37 +60,41 @@
 <groupbox>
   <caption label="&rHeader;"/>
 
-  <separator class="thin"/>
   <label value="&textStartUp;"/>
-    <radiogroup id="whenStartingUp"
+    <radiogroup id="whenStartingUp" class="indent"
                 prefstring="offline.startup_state">
       <radio value="0" label="&radioRememberPrevState;"
              accesskey="&radioRememberPrevState.accesskey;"/>
       <radio value="1" label="&radioAskMe;"
              accesskey="&radioAskMe.accesskey;"/>
     </radiogroup>
-  <separator class="thin"/>
+
+  <separator/>
+
   <label value="&textGoingOnline;"/>
     <radiogroup id="whengoingOnlinestate"
+                orient="horizontal" class="indent"
                 prefstring="offline.send.unsent_messages">
-      <radio value="0" label="&radioAskUnsent;"
-             accesskey="&radioAskUnsent.accesskey;"/>
       <radio value="1" label="&radioAutoSend;"
              accesskey="&radioAutoSend.accesskey;"/>
       <radio value="2" label="&radioNotSend;"
              accesskey="&radioNotSend.accesskey;"/>
+      <radio value="0" label="&radioAskUnsent;"
+             accesskey="&radioAskUnsent.accesskey;"/>
     </radiogroup>
 
-  <separator class="thin"/>
+  <separator/>
+
   <label value="&textGoingOffline;"/>
     <radiogroup id="whengoingOfflinestate"
+                orient="horizontal" class="indent"
                 prefstring="offline.download.download_messages">
-      <radio value="0" label="&radioAskDownload;"
-             accesskey="&radioAskDownload.accesskey;"/>
       <radio value="1" label="&radioAutoDownload;"
              accesskey="&radioAutoDownload.accesskey;"/>
       <radio value="2" label="&radioNotDownload;"
              accesskey="&radioNotDownload.accesskey;"/>
+      <radio value="0" label="&radioAskDownload;"
+             accesskey="&radioAskDownload.accesskey;"/>
     </radiogroup>
 
 </groupbox>
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-offline.dtd b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-offline.dtd
index a624f07d2d0..a4b37f4a313 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-offline.dtd
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-offline.dtd
@@ -8,20 +8,20 @@
 <!ENTITY radioRememberPrevState.accesskey "R">
 <!ENTITY radioAskMe "Ask me for online state at startup">
 <!ENTITY radioAskMe.accesskey "A">
-<!ENTITY textGoingOnline   "When going online:">
-<!ENTITY radioAskUnsent  "Ask me if I want to send my unsent messages">
+<!ENTITY textGoingOnline   "Send unsent messages when going online?">
+<!ENTITY radioAutoSend  "Yes">
+<!ENTITY radioAutoSend.accesskey  "Y">
+<!ENTITY radioNotSend  "No">
+<!ENTITY radioNotSend.accesskey  "N">
+<!ENTITY radioAskUnsent  "Ask me">
 <!ENTITY radioAskUnsent.accesskey  "s">
-<!ENTITY radioAutoSend  "Automatically send my unsent messages">
-<!ENTITY radioAutoSend.accesskey  "u">
-<!ENTITY radioNotSend  "Do not send my unsent messages">
-<!ENTITY radioNotSend.accesskey  "D">
-<!ENTITY textGoingOffline   "When going offline:">
-<!ENTITY radioAskDownload  "Ask me if I want to download messages for offline use">
+<!ENTITY textGoingOffline   "Download messages for offline use when going offline?">
+<!ENTITY radioAutoDownload  "Yes">
+<!ENTITY radioAutoDownload.accesskey  "e">
+<!ENTITY radioNotDownload  "No">
+<!ENTITY radioNotDownload.accesskey  "o">
+<!ENTITY radioAskDownload  "Ask me">
 <!ENTITY radioAskDownload.accesskey  "k">
-<!ENTITY radioAutoDownload  "Automatically download messages for offline use">
-<!ENTITY radioAutoDownload.accesskey  "o">
-<!ENTITY radioNotDownload  "Do not download messages for offline use">
-<!ENTITY radioNotDownload.accesskey  "n">
 <!ENTITY Diskspace "Disk Space">
 <!ENTITY offlineCompact.label "Compact folders when it will save over">
 <!ENTITY offlineCompact.accesskey "C">