Changeset 2694fe

Timestamp:

Jul 25, 2007, 2:16:05 PM (15 years ago)

Author:

rene <rene@…>

Branches:

master

Children:

e8f60f

Parents:

9e9bab

Message:

import version 0.4.1

Files:

• chrome/content/v_identity/_version.dtd (modified) (1 diff)
• chrome/content/v_identity/vI_account.js (modified) (1 diff)
• chrome/content/v_identity/vI_context.xul (modified) (1 diff)
• chrome/content/v_identity/vI_getHeader.js (modified) (4 diffs)
• chrome/content/v_identity/vI_getHeader.xul (modified) (1 diff)
• chrome/content/v_identity/vI_msgIdentityClone.js (modified) (8 diffs)
• chrome/content/v_identity/vI_notificationBar.js (modified) (3 diffs)
• chrome/content/v_identity/vI_prefDialog.js (modified) (4 diffs)
• chrome/content/v_identity/vI_prefDialog.xul (modified) (5 diffs)
• chrome/content/v_identity/vI_smartIdentity.js (modified) (15 diffs)
• chrome/content/v_identity/v_identity.js (modified) (11 diffs)
• chrome/content/v_identity/v_identity.xul (modified) (2 diffs)
• chrome/locale/cs-CZ/v_identity/contents.rdf (modified) (1 diff)
• chrome/locale/cs-CZ/v_identity/v_identity.dtd (modified) (3 diffs)
• chrome/locale/de-DE/v_identity/v_identity.dtd (modified) (3 diffs)
• chrome/locale/en-US/v_identity/v_identity.dtd (modified) (3 diffs)
• chrome/locale/es-ES/v_identity/v_identity.dtd (modified) (3 diffs)
• chrome/locale/fr-FR/v_identity/v_identity.dtd (modified) (3 diffs)
• chrome/locale/it-IT/v_identity/v_identity.dtd (modified) (2 diffs)
• chrome/locale/nl-NL/v_identity/v_identity.dtd (modified) (3 diffs)
• chrome/skin/classic/v_identity/v_identity.css (modified) (1 diff)
• defaults/preferences/preferences.js (modified) (2 diffs)
• install.js (modified) (1 diff)
• install.rdf (modified) (2 diffs)

chrome/content/v_identity/_version.dtd

@@ -1 @@
-<!ENTITY vident.version "0.4.0">
+<!ENTITY vident.version "0.4.1">

chrome/content/v_identity/vI_account.js

@@ -161 +161 @@
                 case "2"  :
                 dump ("## vI_account: preparing Fcc --- use Settings of Default Account\n");
-                vI_account.account.defaultIdentity.doFcc = gAccountManager.defaultIdentity.doFcc;
+                vI_account.account.defaultIdentity.doFcc = gAccountManager.defaultAccount.defaultIdentity.doFcc;
                 vI_account.account.defaultIdentity.fccFolder = gAccountManager.defaultAccount.defaultIdentity.fccFolder;
                 vI_account.account.defaultIdentity.fccFolderPickerMode = gAccountManager.defaultAccount.defaultIdentity.fccFolderPickerMode;

chrome/content/v_identity/vI_context.xul

@@ -30 +30 @@
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    <script type="application/x-javascript">
+    var vI_context = {
+        prefroot : Components.classes["@mozilla.org/preferences-service;1"]
+            .getService(Components.interfaces.nsIPrefService)
+            .getBranch(null),
+            
+        observe: function(subject, topic, data) {
+            document.getElementById("vI_settingsMenu").setAttribute("hidden", 
+                !vI_context.prefroot.getBoolPref("extensions.virtualIdentity.menu_entry"));
+        }
+        
+    }
+    window.addEventListener("load", function(e) {
+        vI_context.prefroot.QueryInterface(Components.interfaces.nsIPrefBranch2);
+        vI_context.prefroot.addObserver("extensions.virtualIdentity.menu_entry", vI_context, false);
+        vI_context.observe();
+    }, false);
+    window.addEventListener("unload", function(e) {
+        vI_context.prefroot.removeObserver("extensions.virtualIdentity.menu_entry", vI_context, false);
+    }, false);
+    </script>
+    
     <menupopup id="taskPopup">
-        <menuitem label="&vident.prefs.dlgTitle.label;" oncommand="openDialog('chrome://v_identity/content/vI_prefDialog.xul', '', 'chrome,modal');" />
+        <menuitem id="vI_settingsMenu" hidden="true" label="&vident.prefs.dlgTitle.label;" oncommand="openDialog('chrome://v_identity/content/vI_prefDialog.xul', '', 'chrome,modal');" />
     </menupopup> 
 </overlay>

chrome/content/v_identity/vI_getHeader.js

@@ -21 +21 @@
 
     Contributor(s): Christian Weiske
+    Contributor(s): Patrick Brunschwig
  * ***** END LICENSE BLOCK ***** */
 
@@ -26 +27 @@
 * some code copied and adapted from 'display Mail User Agent (MUA)'
 * thanks to Christian Weiske <cweiske@cweiske.de>
+*/
+/**
+* some code copied and adapted from 'enigmail'
+* thanks to Patrick Brunschwig <patrick.brunschwig@gmx.net>
 */
 
@@ -33 +38 @@
             .getService(Components.interfaces.nsIPrefService)
             .getBranch("extensions.virtualIdentity."),
-    label: null,
-    note_list : new Array(),
-    
+            
     strings : document.getElementById("vIdentBundle"),
-
-    noop: function() { return; },
+    
+    headerToSearch : null,
+    
+    prepareHeaderToSearchArray : function() {
+        var headerList = vI_getHeader.preferences.getCharPref("smart_reply_headers").split(/\n/)
+        
+        vI_getHeader.headerToSearch = [];
+        
+        // prepare headerToSearch for speedup.
+        var index
+        for (index = 0; index < headerList.length; index++) {
+            var headerToSearch_splitted = headerList[index].split(/:/)
+            // use first part (all before ':') as the header name
+            var headerNameToSearch = headerToSearch_splitted[0].toLowerCase()
+            // check second or third part for any number
+            var headerNumberToSearch = parseInt(headerToSearch_splitted[1])
+            if (isNaN(headerNumberToSearch)) headerNumberToSearch = parseInt(headerToSearch_splitted[2])
+            
+            // create header name to store the value
+            var headerNameToStore = "vI_" + headerNameToSearch
+            if (!isNaN(headerNumberToSearch)) headerNameToStore += ":" + headerNumberToSearch
+            
+            vI_getHeader.headerToSearch.push({ headerNameToSearch : headerNameToSearch, headerNumberToSearch : headerNumberToSearch,
+                    headerNameToStore : headerNameToStore });
+        }
+    },
+
+    adaptPreferences : function() {
+        // this is only for transition from 0.4.0 to 0.4.1, will be removed after a while
+        try {   if (vI_getHeader.preferences.getBoolPref("smart_reply_prefer_headers")) {
+                vI_notificationBar.dump("## vI_getHeader: preference-format changed\n## vI_getHeader: appending 'to' and 'cc' to header-list\n")
+                vI_getHeader.preferences.setCharPref("smart_reply_headers",
+                    vI_getHeader.preferences.getCharPref("smart_reply_headers") + "\nto\ncc")
+            }
+            else {
+                vI_notificationBar.dump("## vI_getHeader: preference-format changed\n## vI_getHeader: inserting 'to' and 'cc' to header-list\n")
+                vI_getHeader.preferences.setCharPref("smart_reply_headers",
+                    "to\ncc\n" + vI_getHeader.preferences.getCharPref("smart_reply_headers"))
+            }
+            vI_getHeader.preferences.clearUserPref("smart_reply_prefer_headers")
+            vI_notificationBar.dump("## vI_getHeader: 'smart_reply_prefer_headers' preference-entry removed\n")
+        }
+        catch(vErr) { } 
+    },
 
     getHeader: function() {
-        dump("## vI_getHeader: onEndHeaders\n")
+        vI_notificationBar.clear_dump()
+        vI_notificationBar.dump("## vI_getHeader: onEndHeaders\n")
+        var index;
+
+        vI_getHeader.adaptPreferences();
         
         var srcMsgURI = GetLoadedMessage();
         if (srcMsgURI == null) return;
-
-        var header_list = vI_getHeader.preferences.getCharPref("smart_reply_headers").split(/\n/)
-        var hdr = vI_getHeader.messenger.messageServiceFromURI(srcMsgURI).messageURIToMsgHdr(srcMsgURI);
-        //loop through the headers
+        
+        if (/type=application\/x-message-display/.test(srcMsgURI)) {
+            vI_notificationBar.dump("## vI_getHeader: opening stored Message, can't get Message Header\n");
+            return;
+        }
+        
+        try { var hdr = vI_getHeader.messenger.messageServiceFromURI(srcMsgURI).messageURIToMsgHdr(srcMsgURI); }
+        catch(vErr) {
+            vI_notificationBar.dump("## vI_getHeader: can't get Message Header.\n");
+            return;
+        };
+
+        if (!vI_getHeader.headerToSearch) vI_getHeader.prepareHeaderToSearchArray()
+
         var found = false;
         var label = vI_getHeader.strings.getString("vident.getHeader.noHeader");
-        for (headerName in currentHeaderData) {
-            for (index = 0; index < header_list.length; index++) {
-                header_to_search=header_list[index]
-                if (headerName.toLowerCase() == header_to_search.toLowerCase()) {
-                    hdr.setStringProperty(headerName.toLowerCase(),
-                        currentHeaderData[headerName].headerValue);
-                    if (!found) label = vI_getHeader.strings.getString("vident.getHeader.headerFound");
-                    label += " " + headerName.toLowerCase()
-                        + ":" + currentHeaderData[headerName].headerValue
-                    found = true;
+        // create array to count the header
+        var currentHeadersCounter = []
+        // loop through the headers
+        for (header in currentHeaderData) {
+            headerName = currentHeaderData[header].headerName.toLowerCase()
+            if (currentHeadersCounter[headerName]) currentHeadersCounter[headerName]++
+            else currentHeadersCounter[headerName] = 1
+            vI_notificationBar.dump("## vI_getHeader: found header: " + headerName + 
+                    "[:" + currentHeadersCounter[headerName] + "]");
+            
+            for (index = 0; index < vI_getHeader.headerToSearch.length; index++) {
+                if (headerName == vI_getHeader.headerToSearch[index].headerNameToSearch &&
+                    (isNaN(vI_getHeader.headerToSearch[index].headerNumberToSearch) ||
+                        vI_getHeader.headerToSearch[index].headerNumberToSearch == currentHeadersCounter[headerName])) {
+                    
+                    var value = currentHeaderData[header].headerValue;
+                    if (currentHeadersCounter[headerName] != 1)
+                        value = hdr.getStringProperty(vI_getHeader.headerToSearch[index].headerNameToStore) + 
+                        ", " + value;
+                    hdr.setStringProperty(vI_getHeader.headerToSearch[index].headerNameToStore,value);
+                    vI_notificationBar.dump(" ...stored");
+                    
+                    if (!found) { 
+                        label = vI_getHeader.strings.getString("vident.getHeader.headerFound");
+                        found = true;
+                    }
+                    label += " " + currentHeaderData[header].headerName + 
+                    "[:" + currentHeadersCounter[headerName] + "]:" + currentHeaderData[header].headerValue
+                    break;
                 }
             }
+            vI_notificationBar.dump("\n");
         }
         vI_notificationBar.setNote(label, "get_header_notification");
+    },
+    
+    hideExtraHeader: function() {
+        var index;
+        var header_list = vI_prepareHeader.addedHeaders
+        for (index = 0; index < header_list.length; index++) {
+            var header_to_search_splitted=header_list[index].split(/:/)
+            var header_to_search=header_to_search_splitted[0].toLowerCase()
+            if (typeof(gExpandedHeaderView[header_to_search]) == "object") {
+            if (! gViewAllHeaders) {
+                gExpandedHeaderView[header_to_search].enclosingBox.setAttribute("hidden", true);
+            }
+            else {
+                gExpandedHeaderView[header_to_search].enclosingBox.removeAttribute("hidden");
+            }
+            }
+        }
     },
 
     setupEventListener: function() {
         var listener = {};
-        listener.onStartHeaders = vI_getHeader.noop;
+        listener.onStartHeaders = vI_getHeader.hideExtraHeader;
         listener.onEndHeaders   = vI_getHeader.getHeader;
         gMessageListeners.push(listener);
@@ -76 +172 @@
         vI_getHeader.messenger = vI_getHeader.messenger.QueryInterface(Components.interfaces.nsIMessenger);
         vI_getHeader.strings = document.getElementById("vIdentBundle");
-    },
+    }
 }
 
+
+var vI_prepareHeader = {
+    prefroot : Components.classes["@mozilla.org/preferences-service;1"]
+            .getService(Components.interfaces.nsIPrefService)
+            .getBranch(null),
+            
+    addedHeaders : [],
+    
+    observer_added : false,
+    
+    init : function() {
+        vI_notificationBar.dump("## vI_prepareHeader: init\n");
+        if (vI_prepareHeader.addExtraHeader()) vI_prepareHeader.addObserver();
+    },
+    
+    cleanup : function() {
+        vI_notificationBar.dump("## vI_prepareHeader: cleanup\n");
+        vI_prepareHeader.removeObserver();
+        vI_prepareHeader.removeExtraHeader();
+    },
+    
+    addObserver : function() {
+        if (vI_prepareHeader.observer_added) return;
+        vI_prepareHeader.prefroot.QueryInterface(Components.interfaces.nsIPrefBranch2);
+        vI_prepareHeader.prefroot.addObserver("extensions.virtualIdentity.smart_reply_headers", this, false);
+        vI_prepareHeader.observer_added = true;
+        vI_notificationBar.dump("## vI_prepareHeader: prefs observer added\n");
+    },
+    
+    removeObserver : function() {
+        if (!vI_prepareHeader.observer_added) return;
+        vI_prepareHeader.prefroot.removeObserver("extensions.virtualIdentity.smart_reply_headers", this);
+        vI_notificationBar.dump("## vI_prepareHeader: prefs observer removed\n");
+        vI_prepareHeader.observer_added = false;
+    },
+    
+    // this is a adapted copy of enigEnsureExtraHeaders() from enigmail, thanks
+    addExtraHeader : function() {
+        vI_notificationBar.dump("## vI_prepareHeader: addExtraHeader\n");
+        var header_list = vI_prepareHeader.prefroot.getCharPref("extensions.virtualIdentity.smart_reply_headers").split(/\n/)
+        try {
+            var extraHdrs = " " + 
+                vI_prepareHeader.prefroot.getCharPref("mailnews.headers.extraExpandedHeaders").toLowerCase()
+                + " ";
+
+            for (index = 0; index < header_list.length; index++) {
+                var headerToSearch_splitted = header_list[index].split(/:/)
+                var headerToSearch = headerToSearch_splitted[0].toLowerCase()
+                
+                var j; var found = false;
+                // check if Header is included in collapsed HeaderView
+                for (j = 0; j < gCollapsedHeaderList.length; j++) {
+                    if (gCollapsedHeaderList[j].name == headerToSearch) {
+                        vI_notificationBar.dump("## vI_prepareHeader: Header '" + headerToSearch + "' in gCollapsedHeaderList\n");
+                        found = true; break;
+                    }
+                }
+                if (found) continue;
+                // check if Header is included in expanded HeaderView
+                for (j = 0; j < gExpandedHeaderList.length; j++) {
+                    if (gExpandedHeaderList[j].name == headerToSearch) {
+                        vI_notificationBar.dump("## vI_prepareHeader: Header '" + headerToSearch + "' in gExpandedHeaderList\n");
+                        found = true; break;
+                    }
+                }
+                if (found) continue;
+
+                var addedHeadersString = " " + vI_prepareHeader.addedHeaders.join(" ") + " "
+                if ((extraHdrs.indexOf(" " + headerToSearch + " ") < 0) &&
+                    (addedHeadersString.indexOf(" " + headerToSearch + " ") < 0))
+                    vI_prepareHeader.addedHeaders.push(headerToSearch);
+                else vI_notificationBar.dump("## vI_prepareHeader: Header '" + headerToSearch + "' already in extraExpandedHeaders\n");
+            }
+            
+            if (vI_prepareHeader.addedHeaders.length > 0) {
+                extraHdrs += vI_prepareHeader.addedHeaders.join(" ");
+                extraHdrs = extraHdrs.replace(/^ */, "").replace(/ *$/, "");
+                vI_prepareHeader.prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", extraHdrs)
+            }
+            vI_notificationBar.dump("## vI_prepareHeader: extraExpandedHeaders '" + vI_prepareHeader.addedHeaders.join(" ") + "' added\n");
+            
+            
+            vI_notificationBar.dump("## vI_prepareHeader: done\n");
+            return true;
+        }
+        catch (e) {
+            vI_notificationBar.dump("## vI_prepareHeader: your application is too old, please update. Otherwise try to install mnenhy or enigmail to use additional headers.")
+            return false;
+        }
+    },
+
+    removeExtraHeader: function() {
+        vI_notificationBar.dump("## vI_prepareHeader: cleanupExtraHeader\n");
+
+        if (vI_prepareHeader.addedHeaders.length > 0) {
+            var extraHdrs = vI_prepareHeader.prefroot.getCharPref("mailnews.headers.extraExpandedHeaders").toLowerCase().split(/ /);
+        
+            for (i = 0; i < vI_prepareHeader.addedHeaders.length; i++) {
+                for (j = 0; j < extraHdrs.length; j++) {
+                    if (extraHdrs[j] == vI_prepareHeader.addedHeaders[i]) {
+                        extraHdrs.splice(j,1);
+                        break;
+                    }
+                }
+            }
+            vI_prepareHeader.prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", extraHdrs.join(" "))
+            vI_notificationBar.dump("## vI_prepareHeader: extraExpandedHeaders '" + vI_prepareHeader.addedHeaders.join(" ") + "' removed\n");
+            vI_prepareHeader.addedHeaders = [];
+        }
+    },
+    
+    observe: function(subject, topic, data) {
+        if (topic == "nsPref:changed") {
+            vI_prepareHeader.removeExtraHeader();
+            vI_prepareHeader.addExtraHeader();
+            vI_notificationBar.dump("## vI_prepareHeader: changed preference '" + data + "'\n");
+            
+            // remove (old) prepared headerArray
+            vI_getHeader.headerToSearch = null;
+            
+            vI_notificationBar.dump("## vI_prepareHeader: reload Message\n");
+            MsgReload();
+        }
+    }
+}
+
 addEventListener('messagepane-loaded', vI_getHeader.setupEventListener, true);
+window.addEventListener("load", function(e) { vI_prepareHeader.init(); }, false);
+window.addEventListener("unload", function(e) { vI_prepareHeader.cleanup(); }, false);

chrome/content/v_identity/vI_getHeader.xul

@@ -42 +42 @@
   </stringbundleset>
 
+<vbox id="messagepanebox" >
+    <splitter id="vIDebugBoxSplitter" hidden="true"/>
+    <textbox id="vIDebugBox" hidden="true" multiline="true" readonly="true"
+    DOMAttrModified="if(event.attrName == 'value') this.value = event.newValue; return true;"/>
+</vbox>
+
 <vbox id="messagepanebox">
      <notificationbox id="vINotification" position="1" insertbefore="msgheaderstoolbar-box"/>

chrome/content/v_identity/vI_msgIdentityClone.js

@@ -43 +43 @@
         vI_msgIdentityClone.elements.Obj_MsgIdentityPopup_clone = document.getElementById("msgIdentityPopup_clone");
         vI_msgIdentityClone.clone_Obj_MsgIdentity();
+        vI_msgIdentityClone.elements.Obj_MsgIdentity.setAttribute("hidden", "true");
+        vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.setAttribute("hidden", "false");
+        vI_msgIdentityClone.elements.Obj_MsgIdentity.previousSibling.setAttribute("control", "msgIdentity_clone");
     },
     
@@ -61 +64 @@
             newMenuItem.setAttribute("accountname", vI.helper.getAccountname(newMenuItem))
         }
+        if (!vI_msgIdentityClone.elements.Obj_MsgIdentity.selectedItem) {
+            vI_notificationBar.dump("## vI_msgIdentityClone: Obj_MsgIdentity.selectedItem not set, using first Menuitem\n");
+            vI_msgIdentityClone.elements.Obj_MsgIdentity.selectedItem =
+                vI_msgIdentityClone.elements.Obj_MsgIdentityPopup.firstChild
+            vI_notificationBar.dump("## vI_msgIdentityClone: MsgIdentityPopup.doCommand()\n");
+            vI_msgIdentityClone.elements.Obj_MsgIdentityPopup.doCommand();
+        }
         vI_msgIdentityClone.elements.Obj_MsgIdentity_clone
             .setAttribute("value", vI_msgIdentityClone.elements.Obj_MsgIdentity.selectedItem.getAttribute("value"));
@@ -66 +76 @@
             .setAttribute("label", vI_msgIdentityClone.elements.Obj_MsgIdentity.selectedItem.getAttribute("label"));
         vI_msgIdentityClone.elements.Obj_MsgIdentity_clone
-            .setAttribute("accountkey", vI_msgIdentityClone.elements.Obj_MsgIdentity.selectedItem.getAttribute("accountkey"));
-        vI_msgIdentityClone.elements.Obj_MsgIdentity_clone
             .setAttribute("accountname", vI.helper.getAccountname(vI_msgIdentityClone.elements.Obj_MsgIdentity.selectedItem));
     },
     
     resetMenuToDefault : function () {
-        vI_msgIdentityClone.setMenuToIdentity(gAccountManager.defaultAccount.defaultIdentity.key, false);
-    },
-
-    setMenuToIdentity : function (identitykey, startup) {
+        vI_msgIdentityClone.setMenuToIdentity(gAccountManager.defaultAccount.defaultIdentity.key);
+    },
+
+    setMenuToIdentity : function (identitykey) {
         MenuItems = vI_msgIdentityClone.elements.Obj_MsgIdentityPopup_clone.childNodes
         for (index = 0; index < MenuItems.length; index++) {
@@ -85 +93 @@
             }
         }
-        vI_msgIdentityClone.LoadIdentity(startup);
+        vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.doCommand();
     },
     
@@ -99 +107 @@
             }
         }
+        vI_notificationBar.dump("## vI_msgIdentityClone: MsgIdentityPopup.doCommand()\n");
+        vI_msgIdentityClone.elements.Obj_MsgIdentityPopup.doCommand();
     },
     
@@ -110 +120 @@
     // if VIdentity Extension is closed after the extension area was opened at least once,
     // remove the Virtual Account if a different (usual) Account is choosen in the cloned dropdown-menu
-    LoadIdentity : function(startup)
+    LoadIdentity : function()
     {
         if (vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.selectedItem.value != "vid") {
@@ -116 +126 @@
             vI_smtpSelector.resetMenuToMsgIdentity(
                 vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.selectedItem.value);
-            vI_notificationBar.dump("## vI_msgIdentityClone: calling LoadIdentity(" + startup +") from MsgCompose\n")
-            LoadIdentity(startup);
         }
         vI_msgIdentityClone.initMsgIdentityTextbox_clone();
@@ -211 +219 @@
                             vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.setAttribute("label", address.name + " <" + address.email + ">");
                             vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.setAttribute("accountname", " - " + accounts[i].incomingServer.prettyName);
-                            vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.setAttribute("accountkey", "");
                             return false;
                         }

chrome/content/v_identity/vI_notificationBar.js

@@ -32 +32 @@
     
     Obj_vINotification : null,
+    Obj_DebugBox : null,
     
+    versionOk : false,
+    
+    checkVersion : function() {
+        // the notification-bar only works from 1.5.0.7 on, else thunderbird segfaults
+        const THUNDERBIRD_ID = "{3550f703-e582-4d05-9a08-453d09bdfdc6}";
+        if (("@mozilla.org/xre/app-info;1" in Components.classes) &&
+            ("@mozilla.org/xpcom/version-comparator;1" in Components.classes)) {
+            var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
+                .getService(Components.interfaces.nsIXULAppInfo);
+            var appID = appInfo.ID
+            var appVersion = appInfo.version
+            var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
+                .getService(Components.interfaces.nsIVersionComparator);
+            if (appID != THUNDERBIRD_ID || versionChecker.compare(appVersion, "1.5.0.7") >= 0)
+                vI_notificationBar.versionOk = true
+        }
+    },
+
     init : function() {
         vI_notificationBar.Obj_vINotification = document.getElementById("vINotification");
+        vI_notificationBar.checkVersion();
+        if (!vI_notificationBar.preferences.getBoolPref("debug_notification")) return;
+        vI_notificationBar.Obj_DebugBox = document.getElementById("vIDebugBox");
+        vI_notificationBar.Obj_DebugBox.setAttribute("hidden","false");
+        document.getElementById("vIDebugBoxSplitter").setAttribute("hidden","false");
+        vI_notificationBar.dump_app_version();
     },
     
@@ -43 +68 @@
     },
     
+    clear_dump : function() {
+        if (!vI_notificationBar.Obj_DebugBox) return;
+        new_DebugBox = vI_notificationBar.Obj_DebugBox.cloneNode(false);
+        vI_notificationBar.Obj_DebugBox.parentNode.replaceChild(
+            new_DebugBox, vI_notificationBar.Obj_DebugBox);
+        vI_notificationBar.Obj_DebugBox = new_DebugBox;
+        vI_notificationBar.dump_app_version();
+    },
+    
+    dump_app_version : function(note) {
+        // add some information about the mail-client and the extensions installed
+        if ("@mozilla.org/xre/app-info;1" in Components.classes) {
+            var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
+                .getService(Components.interfaces.nsIXULAppInfo);
+            var protohandler = Components.classes["@mozilla.org/network/protocol;1?name=http"]
+                .getService(Components.interfaces.nsIHttpProtocolHandler);
+            vI_notificationBar.dump(appInfo.name + " " + appInfo.version + " (" + appInfo.appBuildID + "; " + protohandler.oscpu + ")\n")
+        }
+        else vI_notificationBar.dump("mail-client seems not supported by Virtual Identity Extension")
+        
+        // copied and adapted from nightly tester tools from Dave Townsend (http://www.oxymoronical.com/web/firefox/nightly)
+        try {   var em = Components.classes["@mozilla.org/extensions/manager;1"]
+                .getService(Components.interfaces.nsIExtensionManager);
+            var items = em.getItemList(Components.interfaces.nsIUpdateItem.TYPE_EXTENSION, {});
+            var rdfS = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+            var ds = em.datasource;
+            var disabledResource = rdfS.GetResource("http://www.mozilla.org/2004/em-rdf#disabled");
+            var isDisabledResource = rdfS.GetResource("http://www.mozilla.org/2004/em-rdf#isDisabled");
+            var text = [];
+            for (var i=0; i<items.length; i++)
+            {
+                var output = " - " + items[i].name + " " + items[i].version;
+                var source = rdfS.GetResource("urn:mozilla:item:"+items[i].id);
+                var disabled = ds.GetTarget(source, disabledResource, true);
+                if (!disabled) disabled = ds.GetTarget(source, isDisabledResource, true);
+                try {
+                    disabled=disabled.QueryInterface(Components.interfaces.nsIRDFLiteral);
+                    if (disabled.Value=="true") output += " [DISABLED]";
+                }
+                catch (e) { }
+                vI_notificationBar.dump(output + "\n")
+            }
+        }
+        catch (e) {};
+        vI_notificationBar.dump("--------------------------------------------------------------------------------\n")
+    },
+    
     dump : function(note) {
-        dump(note); // maybe this will be changed later, not by now ;)
+        if (!vI_notificationBar.preferences.getBoolPref("debug_notification")) {
+            if (!vI_notificationBar.Obj_DebugBox) return;
+            vI_notificationBar.Obj_DebugBox.setAttribute("hidden","true");
+            document.getElementById("vIDebugBoxSplitter").setAttribute("hidden","true");
+            vI_notificationBar.Obj_DebugBox = null;
+            return
+        }
+        dump(note);
+        if (!vI_notificationBar.Obj_DebugBox) vI_notificationBar.init();
+        if (!vI_notificationBar.Obj_DebugBox) return;
+        var new_text = document.createTextNode(note);
+        var new_br = document.createElementNS("http://www.w3.org/1999/xhtml", 'br');
+        vI_notificationBar.Obj_DebugBox.inputField.appendChild(new_text);
+        vI_notificationBar.Obj_DebugBox.inputField.appendChild(new_br);
+        vI_notificationBar.Obj_DebugBox.inputField.scrollTop = 
+            vI_notificationBar.Obj_DebugBox.inputField.scrollHeight - vI_notificationBar.Obj_DebugBox.inputField.clientHeight
     },
     
@@ -58 +145 @@
     
     addNote: function(note, prefstring) {
+        vI_notificationBar.dump("** " + note + "\n");
         if (!vI_notificationBar.preferences.getBoolPref(prefstring)) return;
         if (!vI_notificationBar.Obj_vINotification) vI_notificationBar.init();
+        if (!vI_notificationBar.versionOk) return;
         if (vI_notificationBar.timer) window.clearTimeout(vI_notificationBar.timer);
         var oldNotification = vI_notificationBar.Obj_vINotification.currentNotification

chrome/content/v_identity/vI_prefDialog.js

@@ -45 +45 @@
                 "VIdent_identity.smart_reply_ask_always",
                 "VIdent_identity.show_smtp",
+                "VIdent_identity.menu_entry",
                 "VIdent_identity.smart_reply_headers",
                 "VIdent_identity.smart_reply_filter",
                 "VIdent_identity.smart_draft",
-                "VIdent_identity.smart_reply_prefer_headers",
                 "VIdent_identity.smart_reply_notification",
                 "VIdent_identity.get_header_notification",
+                "VIdent_identity.smart_reply_defaultFullName",
                 "VIdent_identity.smart_reply_ignoreFullName",
                 "VIdent_identity.smart_reply_autocreate",
-                "VIdent_identity.notification_timeout"],
+                "VIdent_identity.notification_timeout",
+                "VIdent_identity.debug_notification"],
     
         init : function() {
@@ -107 +109 @@
                 "VIdent_identity.smart_reply_headers",
                 "VIdent_identity.smart_reply_filter",
-                "VIdent_identity.smart_reply_prefer_headers",
                 "VIdent_identity.smart_reply_ignoreFullName",
                 "VIdent_identity.smart_reply_autocreate",
@@ -128 +129 @@
             ask_always.setAttribute("disabled", (autocreate.checked || !ask.checked))
             autocreate.setAttribute("disabled", ask_always.checked)
+        },
+        
+        smartReplyHeaderReset : function() {
+            var textfield = document.getElementById("VIdent_identity.smart_reply_headers")
+            textfield.value = "x-original-to\nto\ncc"
         }
     },
@@ -139 +145 @@
         SetSpecialFolderNamesWithDelims();
 
-        var appInfo = Components.classes["@mozilla.org/xre/app-info;1"].getService(Components.interfaces.nsIXULAppInfo);
-        var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"].getService(Components.interfaces.nsIVersionComparator);
+        var appID = null;
+        var appVersion = null;
+        var versionChecker;
+        if("@mozilla.org/xre/app-info;1" in Components.classes) {
+            var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
+                .getService(Components.interfaces.nsIXULAppInfo);
+            appID = appInfo.ID
+            appVersion = appInfo.version
+        }
+        if("@mozilla.org/xpcom/version-comparator;1" in Components.classes)
+            versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
+                .getService(Components.interfaces.nsIVersionComparator);
+        else appID = null;
         const THUNDERBIRD_ID = "{3550f703-e582-4d05-9a08-453d09bdfdc6}";
-        //const MOZILLA_ID = "{86c18b42-e466-45a9-ae7a-9b95ba6f5640}";
         const SEAMONKEY_ID = "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}";
-        if ((appInfo.ID == THUNDERBIRD_ID && versionChecker.compare(appInfo.version, "2.0b") < 0) ||
-            (appInfo.ID == SEAMONKEY_ID && versionChecker.compare(appInfo.version, "1.5a") < 0)) {
+        if ((!appID) || (appID == THUNDERBIRD_ID && versionChecker.compare(appVersion, "2.0b") < 0) ||
+            (appID == SEAMONKEY_ID && versionChecker.compare(appVersion, "1.5a") < 0)) {
             document.getElementById("version-warning").setAttribute("hidden", "false");
             document.getElementById("VIdent_identity.smart_draft").setAttribute("disabled", "true");
         }
-        
+        if ((!appID) || (appID == THUNDERBIRD_ID && versionChecker.compare(appVersion, "1.5.0.7") < 0)) {
+            document.getElementById("notificationGroupBox").setAttribute("hidden", "true");
+        }
+        if ((!appID) || (appID != THUNDERBIRD_ID)) {
+            document.getElementById("VIdent_identity.menu_entry").setAttribute("hidden", "true");
+        }
         
         vI_prefDialog.base.smartReplyConstraint(document.getElementById("VIdent_identity.smart_reply"));

chrome/content/v_identity/vI_prefDialog.xul

@@ -86 +86 @@
             <checkbox id="VIdent_identity.show_smtp" label="&vident.prefs.SMTP.label;"
                 prefstring="show_smtp" />
+            <checkbox id="VIdent_identity.menu_entry" label="&vident.prefs.menuEntry.label;"
+                prefstring="menu_entry" />
         </groupbox>
     </tabpanel>
@@ -175 +177 @@
                 <description width="500px">&vident.prefs.smartReplyTab.Tab1.desc;</description>
                 <hbox>
-                <vbox><description width="300px">&vident.prefs.smartReply.headers.desc;</description><spacer flex="1"/></vbox>
+                <vbox><description width="300px">&vident.prefs.smartReply.headers.desc;</description>
+                <spacer flex="1"/>
+                <button label="&vident.prefs.smartReply.headers.reset;" oncommand="vI_prefDialog.base.smartReplyHeaderReset();"/>
+                </vbox>
                 <textbox id="VIdent_identity.smart_reply_headers" multiline="true"
                     rows="4" size="20" wrap="false" flex="1"
                     prefstring="smart_reply_headers" />
                 </hbox>
-                <checkbox id="VIdent_identity.smart_reply_prefer_headers" label="&vident.prefs.smartReply.preferHeader.label;"
-                    prefstring="smart_reply_prefer_headers"/>
             </vbox>
             </groupbox>
@@ -198 +201 @@
                 <checkbox id="VIdent_identity.smart_reply_ignoreFullName" label="&vident.prefs.smartReply.ignoreFullname.label;"
                     prefstring="smart_reply_ignoreFullName" wrap="true" width="500px"/>
+                <hbox>
+                <description width="300px">&vident.prefs.smartReply.defaultFullname.label;</description>
+                <vbox><spacer flex="1"/><textbox id="VIdent_identity.smart_reply_defaultFullName" flex="1"
+                    prefstring="smart_reply_defaultFullName" size="20" /><spacer flex="1"/></vbox>
+                </hbox>
             </vbox>
             </groupbox>
@@ -225 +233 @@
     <tabpanel orient="vertical" label="&vident.prefs.notificationTab.header;">
         <dialogheader title="&vident.prefs.notificationTab.header;"/>
-        <groupbox>
+        <groupbox id="notificationGroupBox">
         <caption label="&vident.prefs.notificationTab.caption;"/>
         <vbox align="left">
@@ -240 +248 @@
         </vbox>
         </groupbox>
+        <groupbox>
+        <caption label="&vident.prefs.notificationTab.Debug.caption;"/>
+        <vbox align="left">
+            <description width="500px">&vident.prefs.notifyDebug.desc;</description>
+            <checkbox id="VIdent_identity.debug_notification" label="&vident.prefs.notifyDebug.label;"
+                prefstring="debug_notification"/>
+        </vbox>
+        </groupbox>
     </tabpanel>
     </tabpanels>

chrome/content/v_identity/vI_smartIdentity.js

@@ -33 +33 @@
     init : function() {
         // if there is no ID of the original Message  (Why?) leave the function
-        var uri = vI.params.originalMsgURI; 
+        var uri = gMsgCompose.originalMsgURI; 
         if (!uri) {
             vI_notificationBar.dump("## vI_smartIdentity: cant get URI of former Message\n");
             return;
         }
-        var hdr = vI_smartIdentity.messenger.msgHdrFromURI(uri);
-        
-        var type = vI.params.type;
+        try { var hdr = vI_smartIdentity.messenger.messageServiceFromURI(uri).messageURIToMsgHdr(uri); }
+        catch(vErr) {
+            vI_notificationBar.dump("## vI_smartIdentity: can't get Message Header.\n");
+            vI_notificationBar.dump("## vI_smartIdentity: (maybe you're opening a message stored as a file)\n");
+            return;
+        };
+        
+        var type = gMsgCompose.type;
         var msgComposeType = Components.interfaces.nsIMsgCompType;
+        vI_notificationBar.dump("## vI_smartIdentity: msgComposeType = " + type + "\n");
         switch (type) {
+            case msgComposeType.ForwardAsAttachment:
+            case msgComposeType.ForwardInline:
             case msgComposeType.Reply:
             case msgComposeType.ReplyAll:
-            case msgComposeType.ReplyToGroup:
+            case msgComposeType.ReplyToGroup: // reply to a newsgroup, would possibly be stopped later
             case msgComposeType.ReplyToSender:
-            case msgComposeType.ReplyToSenderAndGroup:
+            case msgComposeType.ReplyToSenderAndGroup: // reply to a newsgroup, would possibly be stopped later
+            case msgComposeType.ReplyWithTemplate:
                 if (vI.preferences.getBoolPref("smart_reply"))
                     vI_smartIdentity.SmartReply(hdr);
@@ -63 +72 @@
         vI_notificationBar.dump("## vI_smartIdentity: SmartDraft()\n");
         
-        vI_notificationBar.dump("## vI_smartIdentity: sender " + hdr.author + "\n");
+        var all_addresses = { number : 1, emails : {}, fullNames : {}, combinedNames : {} };
+        vI.headerParser.parseHeadersWithArray(hdr.author, all_addresses.emails,
+            all_addresses.fullNames, all_addresses.combinedNames);
+        all_addresses.emails[0] = all_addresses.emails.value[0]
+        all_addresses.fullNames[0] = all_addresses.fullNames.value[0]
+        all_addresses.combinedNames[0] = all_addresses.combinedNames.value[0]
+        
+        vI_notificationBar.dump("## vI_smartIdentity: sender '" + all_addresses.combinedNames[0] + "'\n");
+        
+        if (vI_smartIdentity.matchSelectedIdentity(all_addresses)) return;
+        
+        if (vI_smartIdentity.smartIdentity_BaseIdentity = vI_smartIdentity.matchAnyIdentity(all_addresses)) {
+            vI_notificationBar.addNote(
+                vI.elements.strings.getString("vident.smartIdentity.matchExisting"),
+                "smart_reply_notification");
+            window.setTimeout(vI_smartIdentity.updateMsgComposeDialog, 0);
+            return;
+        }
+    
+        vI_smartIdentity.addSmartIdentitiesToCloneMenu(all_addresses);
+    
         vI_notificationBar.setNote(vI.elements.strings.getString("vident.smartIdentity.vIUsage") + ".",
                     "smart_reply_notification");
-        vI_msgIdentityClone.setIdentity(hdr.author)
-
-        vI.helper.addSeparatorToCloneMenu();
-        var object = vI_msgIdentityClone.elements.Obj_MsgIdentityPopup_clone
-        var accountname = document.getElementById("prettyName-Prefix").getAttribute("label")
-            + " - " + vI.helper.getBaseIdentity().email
-        vI.helper.addIdentityMenuItem(object, hdr.author, accountname, "", "vid")
-    },
-    
-    // check if recent email-address (pre-choosen identity) is found in at least one email-address
+        vI_msgIdentityClone.setIdentity(all_addresses.combinedNames[0]);
+    },
+    
+    // check if recent email-address (pre-choosen identity) is found in at least one address
     matchSelectedIdentity : function(all_addresses) {
-        for (index = 0; index < all_addresses.number; index++) { 
-            if (vI.params.identity.email.toLowerCase() == all_addresses.emails.value[index].toLowerCase()
+        vI_notificationBar.dump("## vI_smartIdentity: search for preselected Identity\n");
+        current_email = getCurrentIdentity().email.toLowerCase();
+        current_name =  getCurrentIdentity().fullName.toLowerCase();
+        for (index = 0; index < all_addresses.number; index++) {
+            if (current_email == all_addresses.emails[index].toLowerCase()
                 && (vI.preferences.getBoolPref("smart_reply_ignoreFullName") ||
-                vI.params.identity.fullName == all_addresses.fullNames.value[index])) {
-                    vI_notificationBar.dump("## vI_smartIdentity: found preselected Identity in address sets, aborting\n");
+                current_name == all_addresses.fullNames[index].toLowerCase())) {
+                    vI_notificationBar.dump("## vI_smartIdentity:   found preselected Identity in address sets, aborting\n");
                     return true; // direct hit
                 }
         }
+        vI_notificationBar.dump("## vI_smartIdentity:   collected address(es) doesn't contain preselected Identity, continuing\n");
         return false;
     },
     
-    // checks if the Identity currently described by the extension-area fields i still available as
+    // checks if any Identity in the collected address-set i still available as
     // a stored identity. If so, use the stored one.
     matchAnyIdentity : function(all_addresses) {
+        vI_notificationBar.dump("## vI_smartIdentity: check if any collected address is stored as a (usual) Identity\n");
         var accounts = queryISupportsArray(gAccountManager.accounts, Components.interfaces.nsIMsgAccount);
         for (var i in accounts) {
@@ -101 +129 @@
                 for (index = 0; index < all_addresses.number; index++) {
                     if (identities[j].getUnicharAttribute("useremail").toLowerCase() ==
-                        all_addresses.emails.value[index].toLowerCase() &&
+                        all_addresses.emails[index].toLowerCase() &&
                         (vI.preferences.getBoolPref("smart_reply_ignoreFullName") ||
                         identities[j].getUnicharAttribute("fullName").toLowerCase() ==
-                        all_addresses.fullNames.value[index].toLowerCase())) {
-                            vI_notificationBar.dump("## vI_smartIdentity: found existing Identity in address sets, aborting\n");
+                        all_addresses.fullNames[index].toLowerCase())) {
+                            vI_notificationBar.dump("## vI_smartIdentity:   found existing Identity in address sets, aborting\n");
                             return identities[j];
                         }
@@ -111 +139 @@
                 }
             }
+        vI_notificationBar.dump("## vI_smartIdentity:   no collected address found stored, continuing\n");
         return null;
     },
@@ -116 +145 @@
     
     filterAddresses : function(all_addresses) {
-        var return_addresses = { number : 0,    emails : { value : new Array() },
-                            fullNames : { value : new Array() },
-                            combinedNames : { value : new Array() } };
+        var return_addresses = { number : 0, emails : { }, fullNames : { }, combinedNames : { } };
         
         var filter_list = vI.preferences.getCharPref("smart_reply_filter").split(/\n/)
@@ -142 +169 @@
                         if (skipRegExp) break;
                         try {   /^\/(.*)\/$/.exec(filter_list[i]);
-                            add_addr =  (all_addresses.emails.value[j].match(new RegExp(RegExp.$1,"i")))
+                            add_addr =  (all_addresses.emails[j].match(new RegExp(RegExp.$1,"i")))
                         }
                         catch(vErr) {
@@ -152 +179 @@
                         break;
                     case filterType.StrCmp:
-                        add_addr = (filter_list[i] == all_addresses.emails.value[j])
+                        add_addr = (filter_list[i] == all_addresses.emails[j])
                         break;
                 }
                 if (add_addr)   return_addresses = vI_smartIdentity.addWithoutDuplicates(return_addresses,
-                        all_addresses.emails.value[j],
-                        all_addresses.fullNames.value[j],
-                        all_addresses.combinedNames.value[j])
+                        all_addresses.emails[j],
+                        all_addresses.fullNames[j],
+                        all_addresses.combinedNames[j])
             }
         }
@@ -166 +193 @@
     addWithoutDuplicates : function(all_addresses, email, fullName, combinedName) {
         for (index = 0; index < all_addresses.number; index++) {
-            if (all_addresses.emails.value[index] == email) {
+            if (all_addresses.emails[index] == email) {
                 // found, so check if we can use the Name of the new field
-                if (all_addresses.fullNames.value[index] == "" && fullName != "") {
-                    all_addresses.fullNames.value[index] = fullName
-                    all_addresses.combinedNames.value[index] = combinedName
-                    vI_notificationBar.dump("## vI_smartIdentity: added fullName '" + fullName
+                if (all_addresses.fullNames[index] == "" && fullName != "") {
+                    all_addresses.fullNames[index] = fullName
+                    all_addresses.combinedNames[index] = combinedName
+                    vI_notificationBar.dump("## vI_smartIdentity:   added fullName '" + fullName
                         + "' to stored email '" + email +"'\n")
                 }
@@ -177 +204 @@
             }
         }
-        vI_notificationBar.dump("## vI_smartIdentity: add new address to result:" + email + "\n")
-        all_addresses.emails.value[index] = email;
-        all_addresses.fullNames.value[index] = fullName;
-        all_addresses.combinedNames.value[index] = combinedName;
+        vI_notificationBar.dump("## vI_smartIdentity:   add new address to result:" + combinedName + "\n")
+        all_addresses.emails[index] = email;
+        all_addresses.fullNames[index] = fullName;
+        all_addresses.combinedNames[index] = combinedName;
         all_addresses.number = index + 1;
         return all_addresses;
+    },
+    
+    collectAddresses : function(all_addresses, hdr) {
+        // add emails from selected headers (stored by vI_getHeader.xul/js)
+        var reply_headers = vI.preferences.getCharPref("smart_reply_headers").split(/\n/)
+        for (index = 0; index < reply_headers.length; index++) {
+            // ------------- prepare fields to read the stored header ----------------
+            var replyHeader_splitted = reply_headers[index].split(/:/)
+            // use first part (all before ':') as the header name
+            var replyHeaderName = replyHeader_splitted[0].toLowerCase()
+            // check second or third part for any number
+            var replyHeaderNumber = parseInt(replyHeader_splitted[1])
+            if (isNaN(replyHeaderNumber)) replyHeaderNumber = parseInt(replyHeader_splitted[2])
+            // check if Fullnames should be erased
+            var replyHeaderEmptyFullNames = ((replyHeader_splitted[1] && replyHeader_splitted[1].match(/@/)) ||
+                            (replyHeader_splitted[2] && replyHeader_splitted[2].match(/@/)))
+            
+            // create header name to find the value
+            var replyHeaderNameToRead = replyHeaderName
+            if (!isNaN(replyHeaderNumber)) replyHeaderNameToRead += ":" + replyHeaderNumber
+
+            // ------------- read the stored header -------------------------------
+            var value = hdr.getStringProperty("vI_" + replyHeaderNameToRead)
+            vI_notificationBar.dump("## vI_smartIdentity: reading header '" +
+                replyHeaderNameToRead + "'\n");
+            
+            // ------------- parse address-string to get a field of single email-addresses
+            var splitted = { number : 0, emails : {}, fullNames : {}, combinedNames : {} };
+            splitted.number = vI.headerParser.parseHeadersWithArray(value, splitted.emails,
+                splitted.fullNames, splitted.combinedNames);
+            
+            // move found addresses step by step to all_addresses, and change values if requested
+            for (i = 0; i < splitted.number; i++) {
+                all_addresses.emails[all_addresses.number] = splitted.emails.value[i]
+                
+                // empty FullName if requested
+                if (replyHeaderEmptyFullNames) splitted.fullNames.value[i] = ""
+                all_addresses.fullNames[all_addresses.number] = splitted.fullNames.value[i] 
+                
+                // set CombinedName related to new values
+                if (all_addresses.fullNames[all_addresses.number] != "")
+                    all_addresses.combinedNames[all_addresses.number] =
+                        all_addresses.fullNames[all_addresses.number] + " <" +
+                        all_addresses.emails[all_addresses.number] + ">"
+                else all_addresses.combinedNames[all_addresses.number] =
+                    all_addresses.emails[all_addresses.number]
+                
+                vI_notificationBar.dump("## vI_smartIdentity:   found '" +
+                    all_addresses.combinedNames[all_addresses.number++] + "'\n")
+            }
+        }   
     },
     
@@ -194 +272 @@
         }
         
+        var all_addresses = { number : 0, emails : {}, fullNames : {}, combinedNames : {} };
+        
         /* first step: collect addresses */
-        
-        // add additional emails from selected headers (stored by vI_getHeader.xul/js)
-        var addresses = ""
-        var reply_headers = vI.preferences.getCharPref("smart_reply_headers").split(/\n/)
-        for (index = 0; index < reply_headers.length; index++) {
-            var value = hdr.getStringProperty(reply_headers[index])
-            if (value != "") {
-                vI_notificationBar.dump("## vI_smartIdentity: found '" + value + "' in stored headers\n")
-                addresses += ", " + value
-            }
-        }
-        
-        if (vI.preferences.getBoolPref("smart_reply_prefer_headers"))
-            addresses = addresses + ", " + hdr.recipients + ", " + hdr.ccList
-        else    addresses = hdr.recipients + ", " + hdr.ccList + addresses
-        // replace trailing commata
-        addresses = addresses.replace(/^((, )+)?/, "");
-        vI_notificationBar.dump("## vI_smartIdentity: address-string: '" + addresses + "'\n")
-        
-        var all_addresses = { number : 0, emails : {}, fullNames : {}, combinedNames : {} };
-        all_addresses.number = vI.headerParser
-            .parseHeadersWithArray(addresses, all_addresses.emails,
-                    all_addresses.fullNames, all_addresses.combinedNames);
-        
-        vI_notificationBar.dump("## vI_smartIdentity: " + all_addresses.number + " addresses after parsing, before filtering\n")
-        
+        vI_smartIdentity.collectAddresses(all_addresses, hdr);
+        
+        vI_notificationBar.dump("## vI_smartIdentity: " + all_addresses.number + " address(es) after parsing, before filtering\n")
         
         /* second step: filter (and sort) addresses */
@@ -236 +293 @@
         all_addresses = vI_smartIdentity.filterAddresses(all_addresses);
         
-        vI_notificationBar.dump("## vI_smartIdentity: filtering done, " + all_addresses.number + " addresses left\n")
+        vI_notificationBar.dump("## vI_smartIdentity: filtering done, " + all_addresses.number + " address(es) left\n")
         if (all_addresses.number == 0) return;
         
-        /* second step: select address */
+        var smart_reply_defaultFullName = vI.preferences.getCharPref("smart_reply_defaultFullName")
+        if (smart_reply_defaultFullName != "") {
+            for (index = 0; index < all_addresses.number; index++) {
+                if (all_addresses.fullNames[index] == "") {
+                    all_addresses.fullNames[index] = smart_reply_defaultFullName
+                    all_addresses.combinedNames[index] =
+                        smart_reply_defaultFullName + " <" + all_addresses.emails[index] + ">"
+                    vI_notificationBar.dump("## vI_smartIdentity: added default FullName '" + 
+                        smart_reply_defaultFullName + "' to '" + all_addresses.emails[index] + "'\n")
+                }
+            }
+        }   
+        
+        /* third step: select address */
         
         vI_smartIdentity.addSmartIdentitiesToCloneMenu(all_addresses);
@@ -255 +325 @@
                 + vI.elements.strings.getString("vident.smartIdentity.moreThanOne");
             vI_notificationBar.addNote(label + ".", "smart_reply_notification");
-                    vI_smartIdentity.changeIdentityToSmartIdentity(all_addresses, 0);
+            vI_smartIdentity.changeIdentityToSmartIdentity(all_addresses, 0);
         }
     },
     
     changeIdentityToSmartIdentity : function(all_addresses, selectedValue) {
-        vI_msgIdentityClone.setIdentity(all_addresses.combinedNames.value[selectedValue]);
+        vI_msgIdentityClone.setIdentity(all_addresses.combinedNames[selectedValue]);
         vI_smartIdentity.removeSmartIdentityFromRecipients(all_addresses, selectedValue);
     },
@@ -267 +337 @@
         for (var row = 1; row <= top.MAX_RECIPIENTS; row ++) {
             var input = awGetInputElement(row);
-            if (input.value == all_addresses.emails.value[index] ||
-                input.value == all_addresses.combinedNames.value[index]) {
-                    awDeleteRow(row);
+            if (input.value == all_addresses.emails[index] ||
+                input.value == all_addresses.combinedNames[index]) {
+                    awGetInputElement(row).value = ""
+                    awCleanupRows()
                     vI_notificationBar.addNote(" " +
                         vI.elements.strings.getString("vident.smartIdentity.remRecipient"),
@@ -279 +350 @@
     
     updateMsgComposeDialog : function() {
-        vI_msgIdentityClone.setMenuToIdentity(vI_smartIdentity.smartIdentity_BaseIdentity.key, false);
+        vI_msgIdentityClone.setMenuToIdentity(vI_smartIdentity.smartIdentity_BaseIdentity.key);
         // after inserting a new signature (as part of the new identity) the cursor is not at the right place.
         // there is no easy way to est the cursor at the end, before the signature, so set it at the beginning.
@@ -295 +366 @@
                                     .getAttribute("accountname")
         for (index = 0; index < all_addresses.number; index++)
-            vI.helper.addIdentityMenuItem(object, all_addresses.combinedNames.value[index],
+            vI.helper.addIdentityMenuItem(object, all_addresses.combinedNames[index],
                 accountname, "", "vid")
     },

chrome/content/v_identity/v_identity.js

@@ -48 +48 @@
         },
 
-        selectIdentityMenuItem: function(object, MenuItem) {
-            object.selectedItem = MenuItem;
-            // set the account name on the menu list value.
-            object.setAttribute("label", MenuItem.getAttribute("label"));
-            object.setAttribute("accountname", MenuItem.getAttribute("accountname"));
-            object.setAttribute("accountkey", MenuItem.getAttribute("accountkey"));
-            object.setAttribute("value", MenuItem.getAttribute("value"));
-        },
-
         addSeparatorToCloneMenu: function() {
             var object = vI_msgIdentityClone.elements.Obj_msgIdentityClone;
@@ -72 +63 @@
             var address = vI_msgIdentityClone.elements.Obj_MsgIdentityTextbox_clone.value;
             var splitted = { number : 0, emails : {}, fullNames : {}, combinedNames : {} };
-            vI.headerParser .parseHeadersWithArray(address, splitted.emails,
+            vI.headerParser.parseHeadersWithArray(address, splitted.emails,
                 splitted.fullNames, splitted.combinedNames);
             return { name: splitted.fullNames.value[0], email: splitted.emails.value[0],
@@ -86 +77 @@
                 .getService(Components.interfaces.nsIMsgHeaderParser),
     
-    params : window.arguments[0],
-
     // Those variables keep pointers to original functions which might get replaced later
     original_functions : {
@@ -136 +125 @@
         GenericSendMessage: function (msgType) {
             vI_notificationBar.dump("## v_identity: VIdentity_GenericSendMessage\n");
-
             // dont allow user to fake identity if Message is not sended NOW and thunderbird-version is below 2.0 !!!!
-            var appInfo = Components.classes["@mozilla.org/xre/app-info;1"].getService(Components.interfaces.nsIXULAppInfo);
-            var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"].getService(Components.interfaces.nsIVersionComparator);
+            var appID = null;
+            var appVersion = null;
+            var versionChecker;
+            if("@mozilla.org/xre/app-info;1" in Components.classes) {
+                var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
+                    .getService(Components.interfaces.nsIXULAppInfo);
+                appID = appInfo.ID
+                appVersion = appInfo.version
+            }
+            if("@mozilla.org/xpcom/version-comparator;1" in Components.classes)
+                versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
+                    .getService(Components.interfaces.nsIVersionComparator);
+            else appID = null;
             const THUNDERBIRD_ID = "{3550f703-e582-4d05-9a08-453d09bdfdc6}";
-            //const MOZILLA_ID = "{86c18b42-e466-45a9-ae7a-9b95ba6f5640}";
             const SEAMONKEY_ID = "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}";
             if (msgType != nsIMsgCompDeliverMode.Now &&
-                ((appInfo.ID == THUNDERBIRD_ID && versionChecker.compare(appInfo.version, "2.0b") < 0) ||
-                (appInfo.ID == SEAMONKEY_ID && versionChecker.compare(appInfo.version, "1.5a") < 0)))   {
+                ((!appID) || (appID == THUNDERBIRD_ID && versionChecker.compare(appVersion, "2.0b") < 0) ||
+                (appID == SEAMONKEY_ID && versionChecker.compare(appVersion, "1.5a") < 0))) {
                 var server = gAccountManager.defaultAccount.incomingServer.prettyName
                 var name = gAccountManager.defaultAccount.defaultIdentity.fullName
@@ -179 +177 @@
             if (vI.original_functions.GenericSendMessage) return true;
             if (typeof(GenericSendMessage)=="function") {
-                vI_notificationBar.dump("## v_identity: replace GenericSendMessage\n");
+                vI_notificationBar.dump("## v_identity: replace GenericSendMessage (Virtual Identity activated)\n");
                 vI.original_functions.GenericSendMessage = GenericSendMessage;
                 GenericSendMessage = function (msgType) {
@@ -199 +197 @@
     // initialization //
     init: function() {
+        // clear the DebugArea (not needed cause window is new)
+        //~ vI_notificationBar.clear_dump()
+    
         // initialize the pointers to extension elements
         vI.elements.init_base()
@@ -208 +209 @@
         storage_box.removeChild(vI.elements.Area_MsgIdentityHbox)
         parent_hbox.appendChild(vI.elements.Area_MsgIdentityHbox);
-        
-        vI.elements.Obj_MsgIdentity.setAttribute("hidden", "true");
         
         // initialize the pointers to extension elements (initialize those earlier might brake the interface)
@@ -230 +229 @@
     addVirtualIdentityToMsgIdentityMenu : function()
     {
-        vI.storeBaseIdentity = {
-            label : vI.elements.Obj_MsgIdentity.getAttribute("label"),
-            accountname : vI.elements.Obj_MsgIdentity.getAttribute("accountname"),
-            accountkey : vI.elements.Obj_MsgIdentity.getAttribute("accountkey"),
-            value : vI.elements.Obj_MsgIdentity.getAttribute("value")
-        }
+        vI.storeBaseIdentity = vI.elements.Obj_MsgIdentity.selectedItem
         var newMenuItem = vI.helper.addIdentityMenuItem(vI.elements.Obj_MsgIdentityPopup,
                         vI_account.account.defaultIdentity.identityName,
@@ -241 +235 @@
                         vI_account.account.key,
                         vI_account.account.defaultIdentity.key)
-        vI.helper.selectIdentityMenuItem(vI.elements.Obj_MsgIdentity, newMenuItem)
+        vI.elements.Obj_MsgIdentity.selectedItem = newMenuItem;
+        vI.elements.Obj_MsgIdentity.setAttribute("label", newMenuItem.getAttribute("label"));
+        vI.elements.Obj_MsgIdentity.setAttribute("accountname", newMenuItem.getAttribute("accountname"));
+        vI.elements.Obj_MsgIdentity.setAttribute("value", newMenuItem.getAttribute("value"));
     },
     
@@ -248 +245 @@
     {
         MenuItems = vI_msgIdentityClone.elements.Obj_MsgIdentity.firstChild.childNodes
-        for (index = 0; index < MenuItems.length; index++) {
-            if ( MenuItems[index].getAttribute("value") == vI_account.account.defaultIdentity.key )
-                vI_msgIdentityClone.elements.Obj_MsgIdentity.firstChild.removeChild(MenuItems[index])
-        }
-        vI.elements.Obj_MsgIdentity.setAttribute("label", vI.storeBaseIdentity.label);
-        vI.elements.Obj_MsgIdentity.setAttribute("accountname", vI.storeBaseIdentity.accountname);
-        vI.elements.Obj_MsgIdentity.setAttribute("accountkey", vI.storeBaseIdentity.accountkey);
-        vI.elements.Obj_MsgIdentity.setAttribute("value", vI.storeBaseIdentity.value);
+        for (index = 1; index <= MenuItems.length; index++) {
+            if ( MenuItems[MenuItems.length - index].getAttribute("value") == vI_account.account.defaultIdentity.key )
+                vI_msgIdentityClone.elements.Obj_MsgIdentity.firstChild.removeChild(MenuItems[MenuItems.length - index])
+        }
+        vI.elements.Obj_MsgIdentity.selectedItem = vI.storeBaseIdentity;
+        vI.elements.Obj_MsgIdentity.setAttribute("label", vI.storeBaseIdentity.getAttribute("label"));
+        vI.elements.Obj_MsgIdentity.setAttribute("accountname", vI.storeBaseIdentity.getAttribute("accountname"));
+        vI.elements.Obj_MsgIdentity.setAttribute("value", vI.storeBaseIdentity.getAttribute("value"));
+        vI.storeBaseIdentity = null;
     },
     
@@ -268 +266 @@
             GenericSendMessage = vI.original_functions.GenericSendMessage;
             vI.original_functions.GenericSendMessage = null;
+            vI_notificationBar.dump("## v_identity: restored GenericSendMessage (Virtual Identity deactivated)\n");
         }
     },

chrome/content/v_identity/v_identity.xul

@@ -50 +50 @@
   </stringbundleset>
 
+<vbox id="appcontent" >
+    <splitter id="vIDebugBoxSplitter" hidden="true"/>
+    <textbox id="vIDebugBox" hidden="true" multiline="true" readonly="true"
+    DOMAttrModified="if(event.attrName == 'value') this.value = event.newValue; return true;"/>
+</vbox>
+
 <toolbox id="headers-box">
     <notificationbox id="vINotification" position="1" insertbefore="MsgHeadersToolbar" />
@@ -58 +64 @@
 <hbox id="msgIdentityHbox" flex="1">
     <menulist id="msgIdentity_clone" class="identity_clone-menulist person-icon"
-        label="..." flex="1" oncommand="vI_msgIdentityClone.LoadIdentity(false);">
+        label="..." flex="1" oncommand="vI_msgIdentityClone.LoadIdentity();" hidden="true">
         <menupopup id="msgIdentityPopup_clone"/>
     </menulist>

chrome/locale/cs-CZ/v_identity/contents.rdf

@@ -20 +20 @@
 
 </RDF:RDF>
-</RDF:RDF>

chrome/locale/cs-CZ/v_identity/v_identity.dtd

@@ -12 +12 @@
 <!ENTITY vident.prefs.smartReplyNewsgroups.label "pouşít Smart Reply i při odpovědi do diskusní skupiny">
 <!ENTITY vident.prefs.SMTP.label "zobrazit nabídku SMTP">
+<!ENTITY vident.prefs.menuEntry.label "přidat poloÅŸku do dialogu MoÅŸnosti v nabídce Nástroje">
 <!ENTITY vident.prefs.vIdentityTab.header "Nastavení virtuálních identit">
 <!ENTITY vident.prefs.vIdentityTab.valueTab.label "vlastnosti ke zkopírování">
@@ -28 +29 @@
 <!ENTITY vident.prefs.smartReplyTab.Tab3.label "3. pouşít adresy">
 <!ENTITY vident.prefs.smartReplyTab.caption "Virtual Identity Smart Reply">
-<!ENTITY vident.prefs.smartReplyTab.Tab1.desc "Pro nalezení identity pro odpověď musí Smart Reply získat seznam moÅŸnÃœch identit odesilatele. Analyzuje proto hlavičky &apos;To&apos; a &apos;Cc&apos;. Má-li Smart Reply analyzovat dodatečné hlavičky, zadejte je zde (moÅŸná si pro jejich rozeznání budete muset nainstalovat další rozšíření, jako například enigmail nebo mnenhy).">
-<!ENTITY vident.prefs.smartReply.headers.desc "nové hlavičky - jedna na řádku, bez &apos;:&apos;, například &apos;x-original-to&apos;">
-<!ENTITY vident.prefs.smartReply.preferHeader.label "upřednostnit adresy těchto hlaviček před &apos;To&apos; a &apos;Cc&apos;">
+<!ENTITY vident.prefs.smartReplyTab.Tab1.desc "Pro nalezení identity pro odpověď musí Smart Reply získat seznam moÅŸnÃœch identit odesilatele. Analyzuje proto hlavičky &apos;To&apos; a &apos;Cc&apos;. Má-li Smart Reply analyzovat dodatečné hlavičky. Zde můşete zadat tyto a/nebo jiné hlavičky. (Dodatečné moÅŸnosti: Pro vÃœběr n-té hlavičky z několika hlaviček stejného jména přidejte &apos;:n&apos;. Pokud k některému záznamu přidáte &apos;:@&apos;, pouÅŸije se pouze e-mailová adresa a jméno bude ignorováno.)">
+<!ENTITY vident.prefs.smartReply.headers.desc "nové hlavičky - jedna na řádku, bez &apos;:&apos;, například &apos;x-original-to&apos; nebo &apos;x-original-to:@&apos; nebo &apos;x-original-to:2:@&apos;">
+<!ENTITY vident.prefs.smartReply.headers.reset "nastavit vÜchozí hodnoty">
 <!ENTITY vident.prefs.smartReplyTab.Tab2.desc "Adresy se musí po získání filtrovat. Filtry jsou aplikovány postupně, můşete je tedy pouşít pro seřazení vÃœsledku. První nalezená adresa můşe bÃœt ihned pouÅŸita jako odesilatelova identita. Pokud nepouÅŸijete filtr, budou přeneseny vÅ¡echny adresy.">
 <!ENTITY vident.prefs.smartReply.filter.desc "Filtr Smart Reply - jeden filtr na řádku, je moÅŸné pouşít regulární vÃœrazy (například &apos;/@mozilla.org$/&apos; platí pro vÅ¡echny e-maily z domény mozilla.org">
 <!ENTITY vident.prefs.smartReply.ignoreFullname.label "při porovnání e-mailu s existujícími identitami ignorovat celé jméno">
+<!ENTITY vident.prefs.smartReply.defaultFullname.label "pokud k şádné nalezené e-mailové adrese není uvedeno jméno, pouşít následující:">
 <!ENTITY vident.prefs.smartReplyTab.Tab3.desc "Vyfiltrované adresy jsou nakonec přidány do rozbalovacího seznamu identit. Můşete si také zvolit, jak by měly bÃœt pouÅŸity jako nové identity odesilatelů.">
 <!ENTITY vident.prefs.smartReply.ask.label "otevřít dialog pro vÃœběr identity">
@@ -44 +46 @@
 <!ENTITY vident.prefs.notifyTime.prefix.label "doba zobrazení zpráv o stavu (0 = nekonečno)">
 <!ENTITY vident.prefs.notifyTime.postfix.label "vteřin">
+<!ENTITY vident.prefs.notificationTab.Debug.caption "Ladění">
+<!ENTITY vident.prefs.notifyDebug.desc "Chcete-li hledat chyby, vyřeÅ¡it problémy s konfigurací a porozumět tomu, co Virtual Identity dělá (především s filtry SmartReply), můşete si zobrazovat další informace. PouÅŸití této volby vÅ¡ak zpomalí váš e-mailovÃœ klient, proto by neměla bÃœt zapnuta stále.">
+<!ENTITY vident.prefs.notifyDebug.label "zobrazit pole s ladícími informacemi">
 <!ENTITY vident.accPane.prettyName.prefix "virtual Id">
 <!ENTITY vident.replySelector.dialogheader.title "Virtual Identity Smart Reply">

chrome/locale/de-DE/v_identity/v_identity.dtd

@@ -12 +12 @@
 <!ENTITY vident.prefs.smartReplyNewsgroups.label "verwende Smart Reply auch bei Antworten an Newsgruppen">
 <!ENTITY vident.prefs.SMTP.label "zeige SMTP Auswahlmenu">
+<!ENTITY vident.prefs.menuEntry.label "fÃŒge Einstellungs-Dialog zu Menu Extras hinzu">
 <!ENTITY vident.prefs.vIdentityTab.header "Eigenschaften der Virtuellen IdentitÀt">
 <!ENTITY vident.prefs.vIdentityTab.valueTab.label "zu kopierende Einstellungen">
@@ -28 +29 @@
 <!ENTITY vident.prefs.smartReplyTab.Tab3.label "3. Adressen ÃŒbernehmen">
 <!ENTITY vident.prefs.smartReplyTab.caption "Virtual Identity Smart Reply">
-<!ENTITY vident.prefs.smartReplyTab.Tab1.desc "In einem ersten Schritt muss &apos;Smart Reply&apos; eine Liste der möglichen Sendeadressen ihrer Antwort erstellen. DafÌr werden die EmpfÀngerfelder &apos;To&apos; und &apos;Cc&apos; der email ausgewertet. Wenn weitere Kopfzeilen der Mail ausgewertet werden sollen, kann dies hier angegeben werden (dafÌr mÌssen möglicherweise andere Erweiterungen, bspw. enigmail oder mnenhy, installiert sein).">
-<!ENTITY vident.prefs.smartReply.headers.desc "zusÀtzliche Kopfzeilen  -  je eine pro Zeile, Angabe ohne &apos;:&apos;, bspw. &apos;x-original-to&apos;">
-<!ENTITY vident.prefs.smartReply.preferHeader.label "bevorzuge Adressen dieser Kopfzeilen vor &apos;To&apos; und &apos;Cc&apos;">
-<!ENTITY vident.prefs.smartReplyTab.Tab2.desc "Im zweiten Schritt werden die möglichen Sendeadressen gefiltert. Alle Filter werden der Reihe nach angewandt, so werden die Adressen gleichzeitig sortiert. Die zuerst gefundene Adresse kann dann direkt als Sender Ìbernommen werden. Wird kein Filter angegeben, werden alle Adresen Ìbernommen.">
+<!ENTITY vident.prefs.smartReplyTab.Tab1.desc "In einem ersten Schritt muss &apos;Smart Reply&apos; eine Liste der möglichen Sendeadressen ihrer Antwort erstellen. DafÌr werden Ìblicherweise die EmpfÀngerfelder &apos;To&apos; und &apos;Cc&apos; der Email ausgewertet. Hier können diese und weitere Kopfzeilen angegeben werden. (ergÀnzende Optionen: Auswahl der Kopfzeile Nummer n aus mehreren Kopfzeilen mit gleicher Bezeichnung durch &apos;:n&apos;. Email-Adressen Ìbernehmen, Namen ignorieren durch &apos;:@&apos;.)">
+<!ENTITY vident.prefs.smartReply.headers.desc "zusÀtzliche Kopfzeilen  -  je eine pro Zeile bspw. &apos;x-original-to&apos; oder &apos;x-original-to:@&apos; oder &apos;x-original-to:2:@&apos;">
+<!ENTITY vident.prefs.smartReply.headers.reset "setze Vorgabe-Werte">
+<!ENTITY vident.prefs.smartReplyTab.Tab2.desc "Im zweiten Schritt werden die möglichen Sendeadressen gefiltert. Alle Filter werden der Reihe nach angewandt, so werden die Adressen gleichzeitig sortiert. Die zuerst gefundene Adresse kann dann direkt als Sender Ìbernommen werden. Wird kein Filter angegeben, werden alle Adressen Ìbernommen.">
 <!ENTITY vident.prefs.smartReply.filter.desc "Smart Reply Filter  -  eine Zeile je Filter, regulÀre AusdrÌcke sind möglich, bspw. filtert &apos;/@mozilla.org$/&apos; nach allen Emailadressen der domain mozilla.org">
 <!ENTITY vident.prefs.smartReply.ignoreFullname.label "ignoriere Namensangaben beim Vergleich der Email-Adressen mit vorhandenen IdentitÀten">
+<!ENTITY vident.prefs.smartReply.defaultFullname.label "falls kein Name zu einer Email-Adresse gefunden wurde, benutze folgenden Namen:">
 <!ENTITY vident.prefs.smartReplyTab.Tab3.desc "Die gefilterten Adressen werden abschliessend dem Sender-Auswahlmenu hinzugefÌgt. Hier kann entschieden werden, ob und wie die gefundenen IdentitÀten als Sender Ìbernommen werden.">
 <!ENTITY vident.prefs.smartReply.ask.label "öffne ein Dialogfenster zur Auswahl der IdentitÀt">
@@ -44 +46 @@
 <!ENTITY vident.prefs.notifyTime.prefix.label "Zeit, bis Nachrichten ausgeblendet werden (0 fÃŒr immer an)">
 <!ENTITY vident.prefs.notifyTime.postfix.label "Sekunden">
+<!ENTITY vident.prefs.notificationTab.Debug.caption "Fehlersuche">
+<!ENTITY vident.prefs.notifyDebug.desc "Zur Fehlersuche und zum besseren VerstÀndnis der Funktionsweise von Virtual Identity, besonders auch der Filter von SmartReply, können weitere Informationen in einem eigenen Bereich angezeigt werden. Diese Debug-Informationen stehen nur in englischer Sprache zur VerfÌgung. Die Ausgabe verlangsamt die Arbeit des Email-Programms und sollte darum nicht dauerhaft aktiviert bleiben.">
+<!ENTITY vident.prefs.notifyDebug.label "zeige Bereich mit Informationen zur Fehlersuche">
 <!ENTITY vident.accPane.prettyName.prefix "virtuelle Id">
 <!ENTITY vident.replySelector.dialogheader.title "Virtual Identity Smart Reply">

chrome/locale/en-US/v_identity/v_identity.dtd

@@ -12 +12 @@
 <!ENTITY vident.prefs.smartReplyNewsgroups.label "use Smart Reply also if answering to a newsgroup">
 <!ENTITY vident.prefs.SMTP.label "show SMTP Menu">
+<!ENTITY vident.prefs.menuEntry.label "add entry for Settings-Dialog to Tools menu">
 <!ENTITY vident.prefs.vIdentityTab.header "Properties of Virtual Identities">
 <!ENTITY vident.prefs.vIdentityTab.valueTab.label "attributes to copy">
@@ -28 +29 @@
 <!ENTITY vident.prefs.smartReplyTab.Tab3.label "3. use addresses">
 <!ENTITY vident.prefs.smartReplyTab.caption "Virtual Identity Smart Reply">
-<!ENTITY vident.prefs.smartReplyTab.Tab1.desc "To find a Reply-Identity, Smart Reply has to get a list of possible sender identities. Therefore the header-fields &apos;To&apos; and &apos;Cc&apos; are analyzed. If Smart Reply should analyze additional header-fields, you can enter them here (maybe you need to install another extension to recognize them, as for instance enigmail or mnenhy).">
-<!ENTITY vident.prefs.smartReply.headers.desc "additional headers  -  one per line, without &apos;:&apos;, for instance &apos;x-original-to&apos;">
-<!ENTITY vident.prefs.smartReply.preferHeader.label "prefer addresses of those headers against &apos;To&apos; und &apos;Cc&apos;">
+<!ENTITY vident.prefs.smartReplyTab.Tab1.desc "To find a Reply-Identity, Smart Reply has to get a list of possible sender identities. Therefore usually the header-fields &apos;To&apos; and &apos;Cc&apos; are analyzed. Here you can enter those and/or other header-fields. (additional options: to select header number n out of any headers with the same name add &apos;:n&apos;. If you add &apos;:@&apos; to any entry, only email-addresses are used, names are ignored.)">
+<!ENTITY vident.prefs.smartReply.headers.desc "additional headers  -  one per line, for instance &apos;x-original-to&apos; or &apos;x-original-to:@&apos; or &apos;x-original-to:2:@&apos;">
+<!ENTITY vident.prefs.smartReply.headers.reset "set default values">
 <!ENTITY vident.prefs.smartReplyTab.Tab2.desc "After getting the addresses they have to be filtered. All filters are used after each other, so you can use them to sort the result too. At the end the first-found address might get used instantly as a senders identity. If you don&apos;t use a filter, all addresses are transferred.">
 <!ENTITY vident.prefs.smartReply.filter.desc "Smart Reply filter  -  one filter per line, usage of regular Expressions possible (for instance &apos;/@mozilla.org$/&apos; is matching every email from domain mozilla.org">
 <!ENTITY vident.prefs.smartReply.ignoreFullname.label "ignore full name while comparing email addresses with existing identities">
+<!ENTITY vident.prefs.smartReply.defaultFullname.label "if there is no name to any found email-address, use the following one:">
 <!ENTITY vident.prefs.smartReplyTab.Tab3.desc "At the end the filtered addresses are added to the message-identity dropdown menu. You can also select, how they are might be used as the new senders identity.">
 <!ENTITY vident.prefs.smartReply.ask.label "open a dialog to choose Identity">
@@ -44 +46 @@
 <!ENTITY vident.prefs.notifyTime.prefix.label "time to show status messages (0 = infinite)">
 <!ENTITY vident.prefs.notifyTime.postfix.label "seconds">
+<!ENTITY vident.prefs.notificationTab.Debug.caption "Debugging">
+<!ENTITY vident.prefs.notifyDebug.desc "To find bugs, solve configuration problems and understand what Virtual Identity is doing, especially with the SmartReply-filters, you can enable some additional informations. Using this option slows down your mail-client, therefore it shouldn't be activated permanently.">
+<!ENTITY vident.prefs.notifyDebug.label "show area with debug-informations">
 <!ENTITY vident.accPane.prettyName.prefix "virtual Id">
 <!ENTITY vident.replySelector.dialogheader.title "Virtual Identity Smart Reply">

chrome/locale/es-ES/v_identity/v_identity.dtd

@@ -12 +12 @@
 <!ENTITY vident.prefs.smartReplyNewsgroups.label "usar la respuesta rápida también para responder a los grupos de noticias">
 <!ENTITY vident.prefs.SMTP.label "mostrar menú SMTP">
+<!ENTITY vident.prefs.menuEntry.label "añadir entrada para el cuadro de opciones al menú Herramientas">
 <!ENTITY vident.prefs.vIdentityTab.header "Propiedades de las identidades virtuales">
 <!ENTITY vident.prefs.vIdentityTab.valueTab.label "atributos a copiar">
@@ -28 +29 @@
 <!ENTITY vident.prefs.smartReplyTab.Tab3.label "3. usar direcciones">
 <!ENTITY vident.prefs.smartReplyTab.caption "Virtual Identity - Respuesta rápida">
-<!ENTITY vident.prefs.smartReplyTab.Tab1.desc "Para encontrar la identidad con la que responder, la respuesta rápida tiene que obtener la lista de los posibles remitentes. Para ello, las cabeceras &apos;Para&apos; y &apos;Cc&apos; son analizadas. Si Smart Reply tiene que analizar cabeceras adicionales, puede incluirlas aquí (es posible que tenga que instalar alguna otra extensión para poder reconocerlas, como por ejemplo enigmail o mnenhy).">
-<!ENTITY vident.prefs.smartReply.headers.desc "cabeceras adicionales - una por línea, sin &apos;:&apos;, or ejemplo &apos;x-original-to&apos;">
-<!ENTITY vident.prefs.smartReply.preferHeader.label "usar las direcciones de estas cabeceras en lugar de &apos;Para&apos; o &apos;Cc&apos;">
+<!ENTITY vident.prefs.smartReplyTab.Tab1.desc "Para encontrar la identidad con la que responder, la respuesta rápida tiene que obtener la lista de los posibles remitentes. Para ello, las cabeceras &apos;Para&apos; y &apos;Cc&apos; son analizadas. Si Smart Reply tiene que analizar cabeceras adicionales, puede incluirlas aquí (Opciones adicionales: para seleccionar la cabecera número n de varias con el mismo nombre añada &apos;:,&apos;. Si añade &apos;:@&apos; en alguna entrada, sólo se usarán las direcciones de correo, los nombres serán ignorados.)">
+<!ENTITY vident.prefs.smartReply.headers.desc "cabeceras adicionales - una por por ejemplo &apos;x-original-to&apos; o &apos;x-original-to:@&apos; o &apos;x-original-to:2:@&apos;">
+<!ENTITY vident.prefs.smartReply.headers.reset "establecer los valores por defecto">
 <!ENTITY vident.prefs.smartReplyTab.Tab2.desc "Una vez obtenidas las direcciones, éstas son filtradas. Todos los filtros se usan después de los anteriores, por lo que puede usarlos también para ordenar los resultados. Al terminar, la primera dirección encontrada se usará como la identidad del remitente. Si no usa filtros, todas las direcciones serán transferidas.">
 <!ENTITY vident.prefs.smartReply.filter.desc "Filtros de respuesta rápida - un filtro por línea, con posibilidad de usar expresiones regulares (por ejemplo, &apos;/@mozilla.org$/&apos; coincide con cualquier correo del dominio mozilla.org">
 <!ENTITY vident.prefs.smartReply.ignoreFullname.label "ignorar los nombres completos al comparar las direcciones de correo con las identidades existentes">
+<!ENTITY vident.prefs.smartReply.defaultFullname.label "si no hay nombres en las direcciones encontradas, usar el siguiente:">
 <!ENTITY vident.prefs.smartReplyTab.Tab3.desc "Una vez terminado, las direcciones filtradas se añadirán al menú desplegable de identidades. Puede también seleccionar cómo se usarán como las nuevas identidades del remitente.">
 <!ENTITY vident.prefs.smartReply.ask.label "abrir una ventana para preguntar la identidad">
@@ -44 +46 @@
 <!ENTITY vident.prefs.notifyTime.prefix.label "tiempo para mostrar el estado de los mensajes (0 = infinito)">
 <!ENTITY vident.prefs.notifyTime.postfix.label "segundos">
+<!ENTITY vident.prefs.notificationTab.Debug.caption "Depuración">
+<!ENTITY vident.prefs.notifyDebug.desc "Para encontrar fallos, resolver problemas y entender lo que está haciendo Virtual Identity, especialmente con los filtros de respuesta rápida, puede habilitar alguna información adicional. Esta información aparecerá mayoritariamente en inglés. Si usa esta opción, el cliente de correo será más lento, por lo que no debe estar activa permanentemente.">
+<!ENTITY vident.prefs.notifyDebug.label "mostrar el área con la información de depuración">
 <!ENTITY vident.accPane.prettyName.prefix "Identidad virtual">
 <!ENTITY vident.replySelector.dialogheader.title "Virtual Identity - Respuesta rápida">

chrome/locale/fr-FR/v_identity/v_identity.dtd

@@ -12 +12 @@
 <!ENTITY vident.prefs.smartReplyNewsgroups.label "utiliser également une réponse intelligente lors d&apos;une réponse à un forum">
 <!ENTITY vident.prefs.SMTP.label "montrer le menu SMTP">
+<!ENTITY vident.prefs.menuEntry.label "add entry for Settings-Dialog to Tools menu">
 <!ENTITY vident.prefs.vIdentityTab.header "Propriétés des identités virtuelles">
 <!ENTITY vident.prefs.vIdentityTab.valueTab.label "Attributs à copier">
@@ -28 +29 @@
 <!ENTITY vident.prefs.smartReplyTab.Tab3.label "3. Utiliser les adresses">
 <!ENTITY vident.prefs.smartReplyTab.caption "Réponse intelligente de Virtual Identity">
-<!ENTITY vident.prefs.smartReplyTab.Tab1.desc "Pour trouver une identité de réponse, la réponse intelligente doit obtenir une liste des identités d&apos;expéditeur possibles. C&apos;est pourquoi les champs d&apos;en-têtes &apos;À&apos; et &apos;Cc&apos; sont analysés. Si vous voulez que la réponse intelligente analyse d&apos;autres champs d&apos;en-têtes, vous pouvez les entrer ici (il vous faut peut-être une autre extension pour les reconnaître, par exemple enigmail ou mnenhy).">
-<!ENTITY vident.prefs.smartReply.headers.desc "en-têtes supplémentaires - un par ligne sans &apos;:&apos;, par exemple &apos;x-original-to&apos;">
-<!ENTITY vident.prefs.smartReply.preferHeader.label "préférer les adresses des ces en-têtes à celles de &apos;À&apos; et &apos;Cc&apos;">
+<!ENTITY vident.prefs.smartReplyTab.Tab1.desc "To find a Reply-Identity, Smart Reply has to get a list of possible sender identities. Therefore usually the header-fields &apos;To&apos; and &apos;Cc&apos; are analyzed. Here you can enter those and/or other header-fields. (additional options: to select header number n out of any headers with the same name add &apos;:n&apos;. If you add &apos;:@&apos; to any entry, only email-addresses are used, names are ignored.)">
+<!ENTITY vident.prefs.smartReply.headers.desc "en-têtes supplémentaires - un par ligne, par exemple &apos;x-original-to&apos; ou &apos;x-original-to:@&apos; ou &apos;x-original-to:2:@&apos;">
+<!ENTITY vident.prefs.smartReply.headers.reset "Restaurer les valeurs par défaut">
 <!ENTITY vident.prefs.smartReplyTab.Tab2.desc "AprÚs avoir obtenu les adresses il faut les filtrer. Les filtres sont utilisés l&apos;un aprÚs l&apos;autre, donc vous pouvez aussi les utiliser pour classer les résultats. A la fin, la premiÚre adresse trouvée peut être utilisée instantanément comme identité d&apos;expéditeur. Si vous n&apos;utilisez aucun filtre, toutes les adresses sont transférées.">
-<!ENTITY vident.prefs.smartReply.filter.desc "filtre de la réponse intelligente - un filtre par ligne, vous pouvez utiliser des expressions réguliÚres (par exemple &apos;/@mozilla.org$/&apos; correspond à toutes les adresses du domaine mozilla.org)">
+<!ENTITY vident.prefs.smartReply.filter.desc "Filtre(s) de la réponse intelligente - un filtre par ligne, vous pouvez utiliser des expressions réguliÚres (par exemple &apos;/@mozilla.org$/&apos; correspond à toutes les adresses du domaine mozilla.org)">
 <!ENTITY vident.prefs.smartReply.ignoreFullname.label "ignorer le nom complet lors de la comparaison des adresses E-mails avec les identités existantes">
+<!ENTITY vident.prefs.smartReply.defaultFullname.label "Si aucune adresse E-mail trouvée ne contient un nom, utiliser le nom suivant :">
 <!ENTITY vident.prefs.smartReplyTab.Tab3.desc "À la fin, les adresses filtrées sont ajoutées au menu déroulant d&apos;identité du message. Vous pouvez également choisir la maniÚre dont elles sont utilisées comme que nouvelle identité d&apos;expéditeur.">
 <!ENTITY vident.prefs.smartReply.ask.label "ouvrir une boîte de dialogue pour choisir l&apos;identité">
@@ -44 +46 @@
 <!ENTITY vident.prefs.notifyTime.prefix.label "durée d&apos;affichage des messages d&apos;état (0 = infini)">
 <!ENTITY vident.prefs.notifyTime.postfix.label "secondes">
+<!ENTITY vident.prefs.notificationTab.Debug.caption "Débogage">
+<!ENTITY vident.prefs.notifyDebug.desc "Pour détecter les bugs, résoudre les problÚmes de configuration et comprendre ce que Virtual Identity fait, en particulier avec les filtres de réponse intelligente, vous pouvez activer la production d&apos;informations complémentaires. Cette option ralentit votre client E-mail, par conséquent vous ne devriez pas l&apos;activer en l&apos;absence de nécessité.">
+<!ENTITY vident.prefs.notifyDebug.label "afficher les informations de débogage">
 <!ENTITY vident.accPane.prettyName.prefix "Id virtuelle">
 <!ENTITY vident.replySelector.dialogheader.title "Réponse intelligente de Virtual Identity">

chrome/locale/it-IT/v_identity/v_identity.dtd

@@ -12 +12 @@
 <!ENTITY vident.prefs.smartReplyNewsgroups.label "Utilizza Smart Reply anche per le risposte ai newsgroup">
 <!ENTITY vident.prefs.SMTP.label "Visualizza il menu SMTP">
+<!ENTITY vident.prefs.menuEntry.label "add entry for Settings-Dialog to Tools menu">
 <!ENTITY vident.prefs.vIdentityTab.header "Proprietà delle identità virtuali">
 <!ENTITY vident.prefs.vIdentityTab.valueTab.label "Attributi da copiare">
@@ -28 +29 @@
 <!ENTITY vident.prefs.smartReplyTab.Tab3.label "3. utilizza indirizzi">
 <!ENTITY vident.prefs.smartReplyTab.caption "Smart Reply di Virtual Identity">
-<!ENTITY vident.prefs.smartReplyTab.Tab1.desc "Per trovare un&apos;identità da usare per le risposte, Smart Reply dovrà costruire una lista delle possibili identità da utilizzare per l&apos;invio. Perciò, verranno analizzate le intestazioni &apos;A&apos; e &apos;Cc&apos;. Se si vuole che Smart Reply analizzi altre intestazioni, si possono inserire in questo campo (probabilmente Ú necessario installare un&apos;altra estensione in grado di riconoscerle, come ad esempio EnigMail o MNENHY).">
-<!ENTITY vident.prefs.smartReply.headers.desc "intestazioni aggiuntive - da inserire in righe separate senza il segno &apos;:&apos;; ad esempio &apos;x-original-to&apos;">
-<!ENTITY vident.prefs.smartReply.preferHeader.label "considera gli indirizzi di queste intestazioni prioritari rispetto ad &apos;A&apos; e &apos;Cc&apos;">
+<!ENTITY vident.prefs.smartReplyTab.Tab1.desc "To find a Reply-Identity, Smart Reply has to get a list of possible sender identities. Therefore usually the header-fields &apos;To&apos; and &apos;Cc&apos; are analyzed. Here you can enter those and/or other header-fields. (additional options: to select header number n out of any headers with the same name add &apos;:n&apos;. If you add &apos;:@&apos; to any entry, only email-addresses are used, names are ignored.)">
+<!ENTITY vident.prefs.smartReply.headers.desc "additional headers  -  one per line, for instance &apos;x-original-to&apos; or &apos;x-original-to:@&apos; or &apos;x-original-to:2:@&apos;">
+<!ENTITY vident.prefs.smartReply.headers.reset "Imposta valori predefiniti">
 <!ENTITY vident.prefs.smartReplyTab.Tab2.desc "Dopo aver raccolto gli indirizzi, Ú necessario filtrarli. Tutti i filtri vengono usati in sequenza, in questo modo Ú possibile filtrare anche i risultati. Alla fine della procedura il primo indirizzo trovato può essere immediatamente utilizzato come identità per la spedizione. Se si decide di non utilizzare i filtri, vengono trasferiti tutti gli indirizzi.">
 <!ENTITY vident.prefs.smartReply.filter.desc "Filtro per Smart Reply - da inserire in righe separate. È possibile utilizzare espressioni regolari (ad esempio &apos;/@mozilla.org$/&apos; da far corrispondere ad ogni e-mail inviata dal dominio mozilla.org">
-<!ENTITY vident.prefs.smartReply.ignoreFullname.label "ignora i nomi completi durante il confronto tra indirizzi e-mail e identità esistenti">
+<!ENTITY vident.prefs.smartReply.ignoreFullname.label "Ignora i nomi completi durante il confronto tra indirizzi e-mail e identità esistenti">
+<!ENTITY vident.prefs.smartReply.defaultFullname.label "Se non Ú presente alcun nome negli indirizzi email individuati, utilizza il seguente:">
 <!ENTITY vident.prefs.smartReplyTab.Tab3.desc "Alla fine dell&apos;operazione, gli indirizzi filtrati verranno aggiunti al menu di scelta dell&apos;identità da utilizzare per il messaggio. È possibile scegliere uno di essi come nuova identità per l&apos;invio.">
-<!ENTITY vident.prefs.smartReply.ask.label "visualizza una finestra di dialogo per la scelta dell&apos;identità ">
-<!ENTITY vident.prefs.smartReply.ask_always.label "chiedi anche se esiste un solo indirizzo possibile">
-<!ENTITY vident.prefs.smartReply.autocreate.label "utilizza la prima identità individuata senza interazione con l&apos;utente">
+<!ENTITY vident.prefs.smartReply.ask.label "Visualizza una finestra di dialogo per la scelta dell&apos;identità ">
+<!ENTITY vident.prefs.smartReply.ask_always.label "Chiedi anche se esiste un solo indirizzo possibile">
+<!ENTITY vident.prefs.smartReply.autocreate.label "Utilizza la prima identità individuata senza interazione con l&apos;utente">
 <!ENTITY vident.prefs.notificationTab.header "Messaggi di stato">
 <!ENTITY vident.prefs.notificationTab.caption "Notifiche">
 <!ENTITY vident.prefs.notifyHeaders.label "Mostra informazioni sulle intestazioni riconosciute">
 <!ENTITY vident.prefs.notifySmartIdentity.label "Attiva i messaggi di stato per Smart Reply / Smart Draft">
-<!ENTITY vident.prefs.notifyTime.prefix.label "durata della visualizzazione per i messaggi di stato (0 = infinita)">
+<!ENTITY vident.prefs.notifyTime.prefix.label "Durata della visualizzazione per i messaggi di stato (0 = infinita)">
 <!ENTITY vident.prefs.notifyTime.postfix.label "secondi">
+<!ENTITY vident.prefs.notificationTab.Debug.caption "Risoluzione dei problemi">
+<!ENTITY vident.prefs.notifyDebug.desc "Al fine di identificare i bug, risolvere problemi di configurazione e comprendere le operazioni compiute da Virtual Identity, Ú possibile ottenere alcune informazioni aggiuntive. L&apos;utilizzo di questa opzione causerà rallentamenti al client di posta, e per questo motivo si consiglia di attivarla soltanto per brevi periodi.">
+<!ENTITY vident.prefs.notifyDebug.label "Visualizza area con le informazioni relative al debug">
 <!ENTITY vident.accPane.prettyName.prefix "Id virtuale">
 <!ENTITY vident.replySelector.dialogheader.title "Smart Reply di Virtual Identity">

chrome/locale/nl-NL/v_identity/v_identity.dtd

@@ -12 +12 @@
 <!ENTITY vident.prefs.smartReplyNewsgroups.label "Slim Antwoorden ook gebruiken als aan een nieuwsgroep wordt geantwoord">
 <!ENTITY vident.prefs.SMTP.label "SMTP menu weergeven">
+<!ENTITY vident.prefs.menuEntry.label "Onderdeel voor Instellingen-dialoogvenster aan Extra menu toevoegen">
 <!ENTITY vident.prefs.vIdentityTab.header "Eigenschappen van virtuele identiteiten">
 <!ENTITY vident.prefs.vIdentityTab.valueTab.label "Te kopiëren eigenschappen">
@@ -28 +29 @@
 <!ENTITY vident.prefs.smartReplyTab.Tab3.label "3. adressen gebruiken">
 <!ENTITY vident.prefs.smartReplyTab.caption "Virtual Identity Slim Antwoorden">
-<!ENTITY vident.prefs.smartReplyTab.Tab1.desc "Om een Antwoord-identiteit te vinden moet Slim Antwoorden een lijst van mogelijke verzender-identiteiten ophalen. Daarom worden de koptekstvelden &apos;Aan&apos; en &apos;Cc&apos; geanalyseerd. Als Slim Antwoorden nog meer koptekstvelden moet analyseren kunt u ze hier ingeven (wellicht dient u een andere extensie te installeren om ze te herkennen, zoals bijvoorbeeld enigmail or mnenhy).">
-<!ENTITY vident.prefs.smartReply.headers.desc "Aanvullende kopteksten - één per regel, zonder &apos;:&apos;, bijvoorbeeld &apos;x-original-to&apos;">
-<!ENTITY vident.prefs.smartReply.preferHeader.label "Adressen van deze kopteksten prevaleren boven &apos;Aan&apos; en &apos;Cc&apos;">
+<!ENTITY vident.prefs.smartReplyTab.Tab1.desc "To find a Reply-Identity, Smart Reply has to get a list of possible sender identities. Therefore usually the header-fields &apos;To&apos; and &apos;Cc&apos; are analyzed. Here you can enter those and/or other header-fields. (additional options: to select header number n out of any headers with the same name add &apos;:n&apos;. If you add &apos;:@&apos; to any entry, only email-addresses are used, names are ignored.)">
+<!ENTITY vident.prefs.smartReply.headers.desc "Aanvullende kopteksten - één per regel, bijvoorbeeld &apos;x-original-to&apos; of &apos;x-original-to:@&apos; of &apos;x-original-to:2:@&apos;">
+<!ENTITY vident.prefs.smartReply.headers.reset "Standaardwaarden instellen">
 <!ENTITY vident.prefs.smartReplyTab.Tab2.desc "Na het ophalen van de adressen dienen ze te worden gefilterd. Alle filters worden na elkaar toegepast, dus u kunt ze ook gebruiken om het resultaat te sorteren. Op het einde kan het eerst aangetroffen adres worden gebruikt als de identiteit van de afzender. Als u geen filter gebruikt worden alle adressen overgebracht.">
 <!ENTITY vident.prefs.smartReply.filter.desc "Slim Antwoorden filter - één filter per regel, gebruik van reguliere expressies is mogelijk (bijvoorbeeld: &apos;/@mozilla.org$/&apos; komt overeen met elk bericht van domein mozilla.org)">
 <!ENTITY vident.prefs.smartReply.ignoreFullname.label "Volledige naam bij vergelijken van e-mail adressen met bestaande identiteiten negeren">
+<!ENTITY vident.prefs.smartReply.defaultFullname.label "Als er geen naam bij een gevonden e-mail adres staat de volgende gebruiken:">
 <!ENTITY vident.prefs.smartReplyTab.Tab3.desc "Op het einde worden de gefilterde adressen toegevoegd aan het bericht-identiteit dropdown menu. U kunt ook selecteren hoe ze worden gebruikt als de nieuwe afzender-identiteit.">
 <!ENTITY vident.prefs.smartReply.ask.label "Dialoogvenster openen om identiteit te kiezen">
@@ -44 +46 @@
 <!ENTITY vident.prefs.notifyTime.prefix.label "Weergaveduur statusberichten (0=oneindig)">
 <!ENTITY vident.prefs.notifyTime.postfix.label "seconden">
+<!ENTITY vident.prefs.notificationTab.Debug.caption "Foutopsporing">
+<!ENTITY vident.prefs.notifyDebug.desc "Om fouten te vinden, configuratieproblemen op te lossen en te begrijpen wat Virtual Identity doet, in het bijzonder met de SlimAntwoorden-filters, kunt u wat aanvullende informatie activeren. Het gebruik van deze optie vertraagt uw mailprogramma en dient derhalve niet permanent ingeschakeld te zijn.">
+<!ENTITY vident.prefs.notifyDebug.label "Veld met foutopsporings-informatie weergeven">
 <!ENTITY vident.accPane.prettyName.prefix "virtuele ID">
 <!ENTITY vident.replySelector.dialogheader.title "Virtual Identity Slim Antwoorden">

chrome/skin/classic/v_identity/v_identity.css

@@ -15 +15 @@
     margin: 0;
     padding: 0;
+}
+
+#vIDebugBox {
+    overflow: auto;
+    font-size: x-small;
+    height: 10em;
 }
 

defaults/preferences/preferences.js

@@ -8 +8 @@
 pref("extensions.virtualIdentity.smart_draft", true);
 pref("extensions.virtualIdentity.smart_reply", true);
+pref("extensions.virtualIdentity.menu_entry", true);
 pref("extensions.virtualIdentity.smart_reply_ask", false);
 pref("extensions.virtualIdentity.smart_reply_ask_always", false);
-pref("extensions.virtualIdentity.smart_reply_headers", "x-original-to");
+pref("extensions.virtualIdentity.smart_reply_headers", "x-original-to\nto\ncc");
 pref("extensions.virtualIdentity.smart_reply_filter", "");
-pref("extensions.virtualIdentity.smart_reply_prefer_headers", true);
 pref("extensions.virtualIdentity.smart_reply_notification", true);
+pref("extensions.virtualIdentity.smart_reply_defaultFullName", "");
 pref("extensions.virtualIdentity.smart_reply_ignoreFullName", false);
 pref("extensions.virtualIdentity.smart_reply_autocreate", true);
@@ -21 +22 @@
 pref("extensions.virtualIdentity.notification_timeout", 5);
 
+
 pref("extensions.{dddd428e-5ac8-4a81-9f78-276c734f75b8}.description", "chrome://v_identity/locale/v_identity.properties");

install.js

@@ -7 +7 @@
 // Editable Items Begin
 var displayName         = "Virtual Identity"; // The name displayed to the user (don't include the version)
-var version             = "0.4.0";
+var version             = "0.4.1";
 var name                = "v_identity"; // The leafname of the JAR file (without the .jar part)
 

install.rdf

@@ -11 +11 @@
         <!-- Thunderbird -->
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>0.7</em:minVersion>
-        <em:maxVersion>3.0</em:maxVersion>
-      </Description>
-      <Description>
-        <!-- Mozilla Suite -->
-        <em:id>{86c18b42-e466-45a9-ae7a-9b95ba6f5640}</em:id>
-        <em:minVersion>1.7</em:minVersion>
-        <em:maxVersion>1.8</em:maxVersion>
+        <em:minVersion>1.5</em:minVersion>
+        <em:maxVersion>3.0a1</em:maxVersion>
       </Description>
       <Description>
          <!-- Seamonkey -->
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>1.0</em:minVersion>
-        <em:maxVersion>1.5</em:maxVersion>
+        <em:minVersion>1.1.1</em:minVersion>
+        <em:maxVersion>1.5a</em:maxVersion>
       </Description>
     </em:targetApplication>
@@ -33 +27 @@
     <em:id>{dddd428e-5ac8-4a81-9f78-276c734f75b8}</em:id>
     <em:name>Virtual Identity</em:name>
-    <em:version>0.4.0</em:version>
+    <em:version>0.4.1</em:version>
     <em:description>Allows you to modify your Identity settings for a single Mail on the fly.</em:description>
     <em:creator>Rene Ejury</em:creator>
+    <em:contributor>Translations: www.babelzilla.org</em:contributor>
     <em:contributor>markh</em:contributor>      <!-- dutch localization -->
     <em:contributor>patheticcockroach</em:contributor>      <!-- french localization -->