Version 0.10

- Option to add Redirect to Forward As menu items and buttons
- Better support for Light and Dark themes
- Better integration with CardBook add-on with relation to contacts sidebar
- Code changes to stay compatible with Thunderbird 65.0a1
- Fix issue where error console couldn't be sent via email

chrome.manifest

@@ -1,15 +1,18 @@
-content  mailredirect  chrome/content/
+content  mailredirect        chrome/content/
 content  mailredirect-icons  chrome/icons/
 
 overlay  chrome://messenger/content/messenger.xul            chrome://mailredirect/content/mailredirectMessengerOverlay.xul
-overlay  chrome://messenger/content/msgHdrViewOverlay.xul    chrome://mailredirect/content/msgHdrViewOverlay.xul
-overlay  chrome://messenger/content/mailWindowOverlay.xul    chrome://mailredirect/content/mailredirect.xul
-overlay  chrome://global/content/customizeToolbar.xul        chrome://mailredirect/content/mailredirectCustomizeToolbar.xul appversion<=58.0b3
-overlay  chrome://messenger/content/customizeToolbar.xul     chrome://mailredirect/content/mailredirectCustomizeToolbar.xul appversion>=59.0a1
+overlay  chrome://messenger/content/msgHdrViewOverlay.xul    chrome://mailredirect/content/msgHdrViewOverlay.xul platformversion<61
+overlay  chrome://messenger/content/messenger.xul            chrome://mailredirect/content/msgHdrViewOverlay.xul platformversion>=61
+overlay  chrome://messenger/content/messageWindow.xul        chrome://mailredirect/content/msgHdrViewOverlay.xul platformversion>=61
+overlay  chrome://messenger/content/mailWindowOverlay.xul    chrome://mailredirect/content/mailredirect.xul platformversion<61
+overlay  chrome://messenger/content/messenger.xul            chrome://mailredirect/content/mailredirect.xul platformversion>=61
+overlay  chrome://messenger/content/messageWindow.xul        chrome://mailredirect/content/mailredirect.xul platformversion>=61
+overlay  chrome://global/content/customizeToolbar.xul        chrome://mailredirect/content/mailredirectCustomizeToolbar.xul platformversion<=58.0b3
+overlay  chrome://messenger/content/customizeToolbar.xul     chrome://mailredirect/content/mailredirectCustomizeToolbar.xul platformversion>=59.0a1
 overlay  chrome://communicator/content/pref/preferences.xul  chrome://mailredirect/content/mailredirectPrefsOverlay.xul
 
-override  chrome://mailredirect/content/aw.js  chrome://mailredirect/content/awPre31.js  application={3550f703-e582-4d05-9a08-453d09bdfdc6} appversion<31.0
-override  chrome://mailredirect/content/aw.js  chrome://mailredirect/content/awPre31.js  application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} appversion<2.28.0
+override  chrome://mailredirect/content/aw.js  chrome://mailredirect/content/awPre31.js  platformversion<31.0
 
 locale  mailredirect  en-US  chrome/locale/en-US/
 locale  mailredirect  ar     chrome/locale/ar/

chrome/content/aw.js

@@ -3,7 +3,12 @@
 "use strict";
 
 Components.utils.import("resource://gre/modules/Services.jsm"); // Gecko 2+ (TB3.3)
-Components.utils.import("resource:///modules/mailServices.js"); // Gecko 5+ (TB5)
+try {
+  // mailServices.js has been renamed MailServices.jsm in TB63
+  Components.utils.import("resource:///modules/MailServices.jsm");
+} catch(ex) {
+  Components.utils.import("resource:///modules/mailServices.js"); // Gecko 5+ (TB5)
+}
 
 top.MAX_RECIPIENTS = 1; /* for the initial listitem created in the XUL */
 
@@ -220,8 +225,7 @@ function awAddRecipientsArray(aRecipientType, aAddressArray)
 
   // Push the new recipients into the found empty rows or append new rows when needed.
   let row = 1;
-  for (let address of aAddressArray)
-  {
+  for (let address of aAddressArray) {
     if (emptyRows.length > 0) {
       row = emptyRows.shift();
     } else {
@@ -486,17 +490,7 @@ function _awSetFocus()
 {
   var listbox = document.getElementById("addressingWidget");
   var theNewRow = awGetListItem(top.awRow);
-
-  //Warning: firstVisibleRow is zero base but top.awRow is one base!
-  var firstVisibleRow = listbox.getIndexOfFirstVisibleRow();
-  var numOfVisibleRows = listbox.getNumberOfVisibleRows();
-
-  //Do we need to scroll in order to see the selected row?
-  if (top.awRow <= firstVisibleRow)
-    listbox.scrollToIndex(top.awRow - 1);
-  else if (top.awRow - 1 >= (firstVisibleRow + numOfVisibleRows))
-    listbox.scrollToIndex(top.awRow - numOfVisibleRows);
-
+  listbox.ensureElementIsVisible(theNewRow);
   top.awInputElement.focus();
 }