diff --git a/mozilla/mail/extensions/offline/content/pref-offline.xul b/mozilla/mail/extensions/offline/content/pref-offline.xul
index c4aecfa3e14..0aebb4e240d 100644
--- a/mozilla/mail/extensions/offline/content/pref-offline.xul
+++ b/mozilla/mail/extensions/offline/content/pref-offline.xul
@@ -93,29 +93,33 @@
 <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;"/>
-    <radio value="1" label="&radioAskMe;"/>
-    </radiogroup>
-  <separator class="thin"/>
-  <label value="&textGoingOnline;"/>
-    <radiogroup id="whengoingOnlinestate"
-                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="&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="1" label="&radioAutoSend;"  accesskey="&radioAutoSend.accesskey;"/>
+    <radio value="2" label="&radioNotSend;"   accesskey="&radioNotSend.accesskey;"/>
+    <radio value="0" label="&radioAskUnsent;" accesskey="&radioAskUnsent.accesskey;"/>
+    </radiogroup>
+
+  <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/mail/extensions/offline/locale/pref-offline.dtd b/mozilla/mail/extensions/offline/locale/pref-offline.dtd
index 2b41dc5d22c..95874660586 100644
--- a/mozilla/mail/extensions/offline/locale/pref-offline.dtd
+++ b/mozilla/mail/extensions/offline/locale/pref-offline.dtd
@@ -4,22 +4,24 @@
 
 <!ENTITY textStartUp   "When starting up:">
 <!ENTITY radioRememberPrevState "Remember previous online state">
+<!ENTITY radioRememberPrevState.accesskey "R">
 <!ENTITY radioAskMe "Ask me for online state at startup">
-<!ENTITY textGoingOnline   "When going online:">
-<!ENTITY radioAskUnsent  "Ask me if I want to send my unsent messages">
-<!ENTITY radioAskUnsent.accesskey	    "A">
-<!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 radioAskDownload.accesskey	    "s">
-<!ENTITY radioAutoDownload  "Automatically download messages for offline use">
-<!ENTITY radioAutoDownload.accesskey	    "t">
-<!ENTITY radioNotDownload  "Do not download messages for offline use">
-<!ENTITY radioNotDownload.accesskey	    "o">
+<!ENTITY radioAskMe.accesskey "A">
+<!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 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 Diskspace "Disk Space">
 <!ENTITY offlineCompact.label "Compact folders when it will save over">
-<!ENTITY offlineCompact.accesskey "c">
+<!ENTITY offlineCompact.accesskey "C">
 <!ENTITY kb.label "KB">