diff --git a/editor/ui/composer/content/editorInlineSpellCheck.js b/editor/ui/composer/content/editorInlineSpellCheck.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/editor/ui/jar.mn b/editor/ui/jar.mn
index 6e481ab2411..dcb5f403253 100644
--- a/editor/ui/jar.mn
+++ b/editor/ui/jar.mn
@@ -37,7 +37,6 @@ comm.jar:
       content/editor/pref-composer.xul                         (composer/content/pref-composer.xul) 
       content/editor/pref-publish.xul                          (composer/content/pref-publish.xul) 
       content/editor/editorSmileyOverlay.xul                   (composer/content/editorSmileyOverlay.xul) 
-      content/editor/editorInlineSpellCheck.js                 (composer/content/editorInlineSpellCheck.js) 
       content/editor/editorPrefsOverlay.xul                    (composer/content/editorPrefsOverlay.xul) 
       content/editor/editorNavigatorOverlay.xul                (composer/content/editorNavigatorOverlay.xul) 
       content/editor/editorMailOverlay.xul                     (composer/content/editorMailOverlay.xul) 
diff --git a/mail/components/compose/content/MsgComposeCommands.js b/mail/components/compose/content/MsgComposeCommands.js
index e8d50ac8461..1ae1dfe15a3 100644
--- a/mail/components/compose/content/MsgComposeCommands.js
+++ b/mail/components/compose/content/MsgComposeCommands.js
@@ -257,8 +257,10 @@ var gComposeRecyclingListener = {
         document.getElementById("FormatToolbar").hidden = false;
     }
 
+    // Stop InlineSpellCheckerUI so personal dictionary is saved
+    InlineSpellCheckerUI.enabled = false;
+    
     //Reset editor
-    InlineSpellChecker.Init(GetCurrentEditor(), false); // unregister inline spell checking listeners and release the spell checker
     EditorResetFontAndColorAttributes();
     EditorCleanup();
 
@@ -646,20 +648,18 @@ function updateComposeItems()
   } catch(e) {}
 }
 
-function openEditorContextMenu()
+function openEditorContextMenu(popup)
 {
-  // if we have a mispelled word, do one thing, otherwise show the usual context menu
-  var spellCheckNoSuggestionsItem = document.getElementById('spellCheckNoSuggestions');
-  var word;
-  var misspelledWordStatus = InlineSpellChecker.updateSuggestionsMenu(document.getElementById('msgComposeContext'), spellCheckNoSuggestionsItem,
-                              word);
-  
-  var hideSpellingItems = (misspelledWordStatus == kSpellNoMispelling);
-  spellCheckNoSuggestionsItem.hidden = hideSpellingItems || misspelledWordStatus != kSpellNoSuggestionsFound;
-  document.getElementById('spellCheckAddToDictionary').hidden = hideSpellingItems;
-  document.getElementById('spellCheckIgnoreWord').hidden = hideSpellingItems;
-  document.getElementById('spellCheckAddSep').hidden = hideSpellingItems;
-  document.getElementById('spellCheckSuggestionsSeparator').hidden = hideSpellingItems;
+  InlineSpellCheckerUI.clearSuggestionsFromMenu();
+  InlineSpellCheckerUI.initFromEvent(document.popupRangeParent, document.popupRangeOffset);
+  var onMisspelling = InlineSpellCheckerUI.overMisspelling;
+  document.getElementById('spellCheckSuggestionsSeparator').hidden = !onMisspelling;
+  document.getElementById('spellCheckAddToDictionary').hidden = !onMisspelling;
+  document.getElementById('spellCheckIgnoreWord').hidden = !onMisspelling;
+  var separator = document.getElementById('spellCheckAddSep');
+  separator.hidden = !onMisspelling;
+  document.getElementById('spellCheckNoSuggestions').hidden = !onMisspelling ||
+      InlineSpellCheckerUI.addSuggestionsToMenu(popup, separator, 5);
 
   updateEditItems();
 }
@@ -1364,6 +1364,7 @@ function ComposeStartup(recycled, aParams)
 
         // Do setup common to Message Composer and Web Composer
         EditorSharedStartup();
+        InitLanguageMenu();
       }
 
       var msgCompFields = gMsgCompose.compFields;
@@ -1592,7 +1593,10 @@ function ComposeLoad()
 function ComposeUnload()
 {
   dump("\nComposeUnload from XUL\n");
-
+
+  // Stop InlineSpellCheckerUI so personal dictionary is saved
+  InlineSpellCheckerUI.enabled = false;
+  
   EditorCleanup();
 
   RemoveMessageComposeOfflineObserver();
@@ -2155,7 +2159,7 @@ function SelectAddress()
 // walk through the recipients list and add them to the inline spell checker ignore list
 function addRecipientsToIgnoreList(aAddressesToAdd)
 {
-  if (InlineSpellChecker.inlineSpellChecker && InlineSpellChecker.inlineSpellChecker.enableRealTimeSpell)
+  if (InlineSpellCheckerUI.enabled)
   {
     // break the list of potentially many recipients back into individual names
     var hdrParser = Components.classes["@mozilla.org/messenger/headerparser;1"].getService(Components.interfaces.nsIMsgHeaderParser);
@@ -2180,19 +2184,7 @@ function addRecipientsToIgnoreList(aAddressesToAdd)
       }
     }
 
-    InlineSpellChecker.inlineSpellChecker.ignoreWords(tokenizedNames, tokenizedNames.length);
-  }
-}
-
-function ToggleInlineSpellChecker(target)
-{
-  if (InlineSpellChecker.inlineSpellChecker)
-  {
-    InlineSpellChecker.editor.setSpellcheckUserOverride(!InlineSpellChecker.inlineSpellChecker.enableRealTimeSpell);
-    target.setAttribute('checked', InlineSpellChecker.inlineSpellChecker.enableRealTimeSpell);
-
-    if (InlineSpellChecker.inlineSpellChecker.enableRealTimeSpell)
-      InlineSpellChecker.checkDocument(window.content.document);
+    InlineSpellCheckerUI.mInlineSpellChecker.ignoreWords(tokenizedNames, tokenizedNames.length);
   }
 }
 
@@ -2310,9 +2302,8 @@ function ChangeLanguage(event)
     sPrefs.setComplexValue("spellchecker.dictionary", nsISupportsString, str);
 
     // now check the document over again with the new dictionary
-    if (InlineSpellChecker.inlineSpellChecker)
-      if (InlineSpellChecker.inlineSpellChecker.enableRealTimeSpell)
-        InlineSpellChecker.checkDocument(window.content.document);
+    if (InlineSpellCheckerUI.enabled)
+      InlineSpellCheckerUI.mInlineSpellChecker.spellCheckRange(null);
   }
   event.stopPropagation();
 }
@@ -3621,5 +3612,8 @@ function InitEditor()
 {
   var editor = GetCurrentEditor();
   gMsgCompose.initEditor(editor, window.content);
-  InlineSpellChecker.Init(editor, sPrefs.getBoolPref("mail.spellcheck.inline"));
+  
+  InlineSpellCheckerUI.init(editor);
+  InlineSpellCheckerUI.enabled = sPrefs.getBoolPref("mail.spellcheck.inline");
+  document.getElementById('menu_inlineSpellCheck').setAttribute('disabled', !InlineSpellCheckerUI.canSpellCheck);
 }
diff --git a/mail/components/compose/content/messengercompose.xul b/mail/components/compose/content/messengercompose.xul
index 8a15da43525..c62b00a8bbc 100644
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -71,10 +71,10 @@
 </stringbundleset>
 
 <script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
-<script type="application/x-javascript" src="chrome://editor/content/editorInlineSpellCheck.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/mailCore.js"/>
+<script type="application/x-javascript" src="chrome://global/content/inlineSpellCheckUI.js"/>
 <script type="application/x-javascript" src="chrome://editor/content/editor.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
 
@@ -241,15 +241,14 @@
 
 <keyset id="editorKeys"/>
 
-<popup id="msgComposeContext"
-    onpopupshowing="openEditorContextMenu();">
-  
+<popup id="msgComposeContext" onpopupshowing="openEditorContextMenu(this);">
+
   <menuitem id="spellCheckNoSuggestions" label="&spellCheckNoSuggestions.label;" disabled="true"/>
   <menuseparator id="spellCheckAddSep"/>
   <menuitem id="spellCheckAddToDictionary" label="&spellCheckAddToDictionary.label;" accesskey="&spellCheckAddToDictionary.accesskey;"
-            oncommand="InlineSpellChecker.addToDictionary(null,null);"/>  
+            oncommand="InlineSpellCheckerUI.addToDictionary();"/>  
   <menuitem id="spellCheckIgnoreWord" label="&spellCheckIgnoreWord.label;" accesskey="&spellCheckIgnoreWord.accesskey;"
-            oncommand="InlineSpellChecker.ignoreWord(null, null)"/>  
+            oncommand="InlineSpellCheckerUI.ignoreWord();"/>  
   <menuseparator id="spellCheckSuggestionsSeparator"/>
 
   <menuitem label="&undo.label;" accesskey="&undo.accesskey;" command="cmd_undo"/>
@@ -417,7 +416,7 @@
           <menuitem label="&checkSpellingCmd.label;" id="menu_checkspelling" accesskey="&checkSpellingCmd.accesskey;" key="key_checkspelling" command="cmd_spelling"/>
           <menuitem label="&enableInlineSpellChecker.label;" id="menu_inlineSpellCheck" 
                            accesskey="&enableInlineSpellChecker.accesskey;" checked="false"
-                           type="checkbox" oncommand="ToggleInlineSpellChecker(event.target)"/>
+                           type="checkbox" oncommand="InlineSpellCheckerUI.enabled = !InlineSpellCheckerUI.enabled"/>
           <menuitem label="&quoteCmd.label;" accesskey="&quoteCmd.accesskey;" command="cmd_quoteMessage"/>
           <menuseparator/>
           <menuitem id="returnReceiptMenu" type="checkbox" label="&returnReceiptMenu.label;" accesskey="&returnReceiptMenu.accesskey;" checked="false" oncommand="ToggleReturnReceipt(event.target)"/>