diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e928d55..9330b8c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@
 
 
 
+<h3>Version 2.3.1 - 25/11/2024</h3>
+      <ul>
+        <li>In the Custom View now it's also possible to manually write the date in the datepicker. The two dates must be separated by "<i>space hyphen space</i>", " - ".</li>
+        <li>Now it's possible to extract all the new charts data (tags, folder, domains) and all the Custom View periods (daily, weekly, monthly, yearly mails) [<a href="https://github.com/micz/ThunderStats/issues/394">#394</a>].</li>
+        <li>Inbox Zero Date Chart tooltip is now visible again [<a href="https://github.com/micz/ThunderStats/issues/392">#392</a>].</li>
+        <li>Custom View sent and received charts day view has now a max width of 30.000 pixels, so it's visible also when querying hundreds of days [<a href="https://github.com/micz/ThunderStats/issues/390">#390</a>].</li>
+        <li>Custom View export menu is now correctly updated [<a href="https://github.com/micz/ThunderStats/issues/393">#393</a>].</li>
+        <li>Preventing concurrent data querying in the Custom View under some circumstances.</li>
+        <li>Some buttons graphic and positioning improved.</li>
+      </ul>
 <h3>Version 2.3.0 - 17/11/2024</h3>
       <ul>
         <li>It's now possible to search for read/unread and starred/unsterred in the Custom View [<a href="https://github.com/micz/ThunderStats/issues/158">#158</a>].</li>
diff --git a/package-lock.json b/package-lock.json
index fd3ac164..84002f74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "thunderstats",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "thunderstats",
-      "version": "2.3.0",
+      "version": "2.3.1",
       "dependencies": {
         "@imengyu/vue3-context-menu": "^1.4.1",
         "@vueform/multiselect": "^2.6.10",
diff --git a/package.json b/package.json
index b36987f9..06ee2bb8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thunderstats",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/public/_locales/de/messages.json b/public/_locales/de/messages.json
index 32f42aad..43ec24c7 100644
--- a/public/_locales/de/messages.json
+++ b/public/_locales/de/messages.json
@@ -672,7 +672,7 @@
     "description": ""
   },
   "MailsInADay": {
-    "message": "E-Mails pro Tag",
+    "message": "Tageszeit",
     "description": ""
   },
   "FolderLocation_percent_handled": {
@@ -812,5 +812,21 @@
   "prefs_customqry_loaddata_when_opening_addon": {
     "message": "Daten laden, auch wenn die benutzerdefinierte Ansicht der erste geöffnete Tab in ThunderStats ist",
     "description": ""
+  },
+  "WeeklyMails": {
+    "message": "Wochenmails",
+    "description": ""
+  },
+  "MonthlyMails": {
+    "message": "Monatsmails",
+    "description": ""
+  },
+  "YearlyMails": {
+    "message": "Jahresmails",
+    "description": ""
+  },
+  "Week": {
+    "message": "Woche",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json
index 36901b63..e86a4a2d 100644
--- a/public/_locales/en/messages.json
+++ b/public/_locales/en/messages.json
@@ -672,7 +672,7 @@
     "description": ""
   },
   "MailsInADay": {
-    "message": "Mails in a day",
+    "message": "Time of the day",
     "description": ""
   },
   "FolderLocation_percent_handled": {
@@ -812,5 +812,21 @@
   "prefs_customqry_loaddata_when_opening_addon": {
     "message": "Load data even when Custom View is the first tab opened in ThunderStats",
     "description": ""
+  },
+  "WeeklyMails": {
+    "message": "Weekly Mails",
+    "description": ""
+  },
+  "MonthlyMails": {
+    "message": "Monthly Mails",
+    "description": ""
+  },
+  "YearlyMails": {
+    "message": "Yearly Mails",
+    "description": ""
+  },
+  "Week": {
+    "message": "Week",
+    "description": ""
   }
 }
diff --git a/public/_locales/fr/messages.json b/public/_locales/fr/messages.json
index a3c42080..7cdb59cc 100644
--- a/public/_locales/fr/messages.json
+++ b/public/_locales/fr/messages.json
@@ -672,7 +672,7 @@
     "description": ""
   },
   "MailsInADay": {
-    "message": "E-mails par jour",
+    "message": "Moment de la journée",
     "description": ""
   },
   "FolderLocation_percent_handled": {
@@ -812,5 +812,21 @@
   "prefs_customqry_loaddata_when_opening_addon": {
     "message": "Charger les données même si la vue personnalisée est l'onglet ouvert en premier dans ThunderStats",
     "description": ""
+  },
+  "WeeklyMails": {
+    "message": "Courriels de la semaine",
+    "description": ""
+  },
+  "MonthlyMails": {
+    "message": "Courriels du mois",
+    "description": ""
+  },
+  "YearlyMails": {
+    "message": "Courriels de l'annee",
+    "description": ""
+  },
+  "week": {
+    "message": "Semaine",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/public/_locales/it/messages.json b/public/_locales/it/messages.json
index 26be6cf1..3bfa9ded 100644
--- a/public/_locales/it/messages.json
+++ b/public/_locales/it/messages.json
@@ -672,7 +672,7 @@
     "description": ""
   },
   "MailsInADay": {
-    "message": "Mail in un giorno",
+    "message": "Ora del giorno",
     "description": ""
   },
   "FolderLocation_percent_handled": {
@@ -812,5 +812,21 @@
   "prefs_customqry_loaddata_when_opening_addon": {
     "message": "Carica i dati anche quando la Vista Personalizzata è la prima scheda aperta in ThunderStats",
     "description": ""
+  },
+  "WeeklyMails": {
+    "message": "Email settimanali",
+    "description": ""
+  },
+  "MonthlyMails": {
+    "message": "Email mensili",
+    "description": ""
+  },
+  "YearlyMails": {
+    "message": "Email annuali",
+    "description": ""
+  },
+  "Week": {
+    "message": "Settimana",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/public/manifest.json b/public/manifest.json
index af412d17..23984d05 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "ThunderStats",
     "description": "Do you remember the old good Eudora statistics? Do you miss them? Using this addon you can finally keep an eye on how you use your beloved Thunderbird!",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "author": "Mic (m@micz.it)",
     "homepage_url": "http://micz.it/thunderbird-addon-thunderstats-your-thunderbird-statistics/",
     "default_locale": "en",
diff --git a/src/assets/main.css b/src/assets/main.css
index d3885419..43189954 100644
--- a/src/assets/main.css
+++ b/src/assets/main.css
@@ -415,6 +415,15 @@ table#customqry_adv_filters_table td{
   cursor: unset;
 }
 
+.btn_pos_3{
+  position: relative;
+  top: -3px;
+}
+
+.chart_inbox0_extended_btn{
+  text-align: right;
+}
+
 .spacer {
   flex-grow: 1;
 }
diff --git a/src/components/ExportMenu.vue b/src/components/ExportMenu.vue
index 34bf61be..ac9caa2a 100644
--- a/src/components/ExportMenu.vue
+++ b/src/components/ExportMenu.vue
@@ -7,7 +7,7 @@
 
 <script setup>
 
-import { ref, computed, onMounted, h } from 'vue';
+import { ref, computed, h } from 'vue';
 import { tsExport } from '@statslib/mzts-export';
 import { tsStore } from '@statslib/mzts-store';
 import { tsUtils } from '@statslib/mzts-utils';
@@ -51,7 +51,6 @@ let export_menu_title = [
         label: h('div', { class: 'my-menu-sperator' }),
         disabled: true,
       },
-
     ];
 
 let export_menu = {
@@ -73,134 +72,268 @@ let export_menu = {
             exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
           }
         },
-        // { 
-        //   label: browser.i18n.getMessage("Last2Week"), 
-        //   onClick: () => {
-        //     setPeriod("last2week");
-        //   }
-        // },
-        // { 
-        //   label: browser.i18n.getMessage("CurrentMonth"), 
-        //   onClick: () => {
-        //     setPeriod("currentmonth");
-        //   }
-        // },
-        // { 
-        //   label: browser.i18n.getMessage("LastMonth"),
-        //   onClick: () => {
-        //     setPeriod("lastmonth");
-        //   }
-        // },
-        // { 
-        //   label: browser.i18n.getMessage("CurrentYear"),
-        //   onClick: () => {
-        //     setPeriod("currentyear");
-        //   }
-        // },
-        // { 
-        //   label: browser.i18n.getMessage("LastYear"),
-        //   onClick: () => {
-        //     setPeriod("lastyear");
-        //   }
-        // },
-        /*{
-          label: "A submenu", 
-          children: [
-            { label: "Item1" },
-            { label: "Item2" },
-            { label: "Item3" },
-          ]
-        },*/
-      ],
-      //========================================== Today Tab - END
-      //========================================== Yesterday Tab
-      "tab-yesterday": [
-        { 
-          label: browser.i18n.getMessage("Correspondents"), 
-          onClick: () => {
-            let export_define = browser.i18n.getMessage("Day") + tsUtils.dateToYYYYMMDD(new Date(Date.now() - (1000 * 60 * 60 * 24)));
-            let export_type = tsExport.export["correspondents"].type;
-            exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
-          }
-        },
-        { 
-          label: browser.i18n.getMessage("MailsInADay"), 
+        {
+          label: browser.i18n.getMessage("Folders"),
           onClick: () => {
-            let export_define = browser.i18n.getMessage("Day") + tsUtils.dateToYYYYMMDD(new Date(Date.now() - (1000 * 60 * 60 * 24)));
-            let export_type = tsExport.export["time_emails"].type;
-            exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
-          }
-        },
-      ],
-      //========================================== ManyDays Tab - END
-      "tab-manydays": [
-        { 
-          label: browser.i18n.getMessage("Correspondents"), 
-          onClick: async () => {
-            let _many_days = await tsPrefs.getPref("_many_days");
-            let export_define = browser.i18n.getMessage("LastNumDays", _many_days);
-            let export_type = tsExport.export["correspondents"].type;
-            exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
-          }
-        },
-        { 
-          label: browser.i18n.getMessage("DailyMails"), 
-          onClick: async () => {
-            let _many_days = await tsPrefs.getPref("_many_days");
-            let export_define = browser.i18n.getMessage("LastNumDays", _many_days);
-            let export_type = tsExport.export["daily_mails"].type;
-            exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
-          }
-        },
-        // { 
-        //   label: browser.i18n.getMessage("MailsInADay"), 
-        //   onClick: async () => {
-        //     let _many_days = await tsPrefs.getPref("_many_days");
-        //     let export_define = browser.i18n.getMessage("LastNumDays", _many_days);
-        //     let export_type = tsExport.export["time_emails"].type;
-        //     exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
-        //   }
-        // },
-      ],
-      //========================================== ManyDays Tab - END
-      //========================================== CustomQry Tab - END
-      "tab-customqry": [
-        { 
-          label: browser.i18n.getMessage("Correspondents"), 
-          onClick: () => {
-            let export_define = browser.i18n.getMessage("CustomQry");
-            let export_type = tsExport.export["correspondents"].type;
+            let export_define = browser.i18n.getMessage("Day") + tsUtils.dateToYYYYMMDD(new Date());
+            let export_type = tsExport.export["folders"].type;
             exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
           }
         },
-        { 
-          label: browser.i18n.getMessage("DailyMails"), 
+        {
+          label: browser.i18n.getMessage("Tags"), 
           onClick: () => {
-            let export_define = browser.i18n.getMessage("CustomQry");
-            let export_type = tsExport.export["daily_mails"].type;
+            let export_define = browser.i18n.getMessage("Day") + tsUtils.dateToYYYYMMDD(new Date());
+            let export_type = tsExport.export["tags"].type;
             exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
           }
         },
-      ],
-      "tab-customqry-single-day": [
-        { 
-          label: browser.i18n.getMessage("Correspondents"), 
+        {
+          label: browser.i18n.getMessage("Domains"), 
           onClick: () => {
-            let export_define = browser.i18n.getMessage("CustomQry");
-            let export_type = tsExport.export["correspondents"].type;
-            exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
-          }
-        },
-        { 
-          label: browser.i18n.getMessage("MailsInADay"), 
-          onClick: async () => {
-            let export_define = browser.i18n.getMessage("Day") + tsUtils.dateToYYYYMMDD(singleDay.value);
-            let export_type = tsExport.export["time_emails"].type;
+            let export_define = browser.i18n.getMessage("Day") + tsUtils.dateToYYYYMMDD(new Date());
+            let export_type = tsExport.export["domains"].type;
             exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
           }
         },
-      ],
-      //========================================== CustomQry Tab - END
+    ],
+    //========================================== Today Tab - END
+    //========================================== Yesterday Tab
+    "tab-yesterday": [
+      { 
+        label: browser.i18n.getMessage("Correspondents"), 
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("Day") + tsUtils.dateToYYYYMMDD(new Date(Date.now() - (1000 * 60 * 60 * 24)));
+          let export_type = tsExport.export["correspondents"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      { 
+        label: browser.i18n.getMessage("MailsInADay"), 
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("Day") + tsUtils.dateToYYYYMMDD(new Date(Date.now() - (1000 * 60 * 60 * 24)));
+          let export_type = tsExport.export["time_emails"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      {
+        label: browser.i18n.getMessage("Folders"),
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("Day") + tsUtils.dateToYYYYMMDD(new Date(Date.now() - (1000 * 60 * 60 * 24)));
+          let export_type = tsExport.export["folders"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      {
+        label: browser.i18n.getMessage("Tags"), 
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("Day") + tsUtils.dateToYYYYMMDD(new Date(Date.now() - (1000 * 60 * 60 * 24)));
+          let export_type = tsExport.export["tags"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      {
+        label: browser.i18n.getMessage("Domains"), 
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("Day") + tsUtils.dateToYYYYMMDD(new Date(Date.now() - (1000 * 60 * 60 * 24)));
+          let export_type = tsExport.export["domains"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+    ],
+    //========================================== ManyDays Tab - END
+    "tab-manydays": [
+      { 
+        label: browser.i18n.getMessage("Correspondents"), 
+        onClick: async () => {
+          let _many_days = await tsPrefs.getPref("_many_days");
+          let export_define = browser.i18n.getMessage("LastNumDays", _many_days);
+          let export_type = tsExport.export["correspondents"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      { 
+        label: browser.i18n.getMessage("DailyMails"), 
+        onClick: async () => {
+          let _many_days = await tsPrefs.getPref("_many_days");
+          let export_define = browser.i18n.getMessage("LastNumDays", _many_days);
+          let export_type = tsExport.export["daily_mails"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      { 
+        label: browser.i18n.getMessage("MailsInADay"), 
+        onClick: async () => {
+          let _many_days = await tsPrefs.getPref("_many_days");
+          let export_define = browser.i18n.getMessage("LastNumDays", _many_days);
+          let export_type = tsExport.export["time_emails"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      {
+        label: browser.i18n.getMessage("Weekdays"), 
+        onClick: async () => {
+          let _many_days = await tsPrefs.getPref("_many_days");
+          let export_define = browser.i18n.getMessage("LastNumDays", _many_days);
+          let export_type = tsExport.export["weekdays"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      {
+        label: browser.i18n.getMessage("Folders"),
+        onClick: async () => {
+          let _many_days = await tsPrefs.getPref("_many_days");
+          let export_define = browser.i18n.getMessage("LastNumDays", _many_days);
+          let export_type = tsExport.export["folders"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      {
+        label: browser.i18n.getMessage("Tags"), 
+        onClick: async () => {
+          let _many_days = await tsPrefs.getPref("_many_days");
+          let export_define = browser.i18n.getMessage("LastNumDays", _many_days);
+          let export_type = tsExport.export["tags"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      {
+        label: browser.i18n.getMessage("Domains"), 
+        onClick: async () => {
+          let _many_days = await tsPrefs.getPref("_many_days");
+          let export_define = browser.i18n.getMessage("LastNumDays", _many_days);
+          let export_type = tsExport.export["domains"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+    ],
+    //========================================== ManyDays Tab - END
+    //========================================== CustomQry Tab - END
+    "tab-customqry": [
+      { 
+        label: browser.i18n.getMessage("Correspondents"), 
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("CustomQry");
+          let export_type = tsExport.export["correspondents"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      { 
+        label: browser.i18n.getMessage("DailyMails"), 
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("CustomQry");
+          let export_type = tsExport.export["daily_mails"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      { 
+        label: browser.i18n.getMessage("WeeklyMails"), 
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("CustomQry");
+          let export_type = tsExport.export["weekly_mails"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      { 
+        label: browser.i18n.getMessage("MonthlyMails"), 
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("CustomQry");
+          let export_type = tsExport.export["monthly_mails"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      { 
+        label: browser.i18n.getMessage("YearlyMails"), 
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("CustomQry");
+          let export_type = tsExport.export["yearly_mails"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      { 
+        label: browser.i18n.getMessage("MailsInADay"), 
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("CustomQry");
+          let export_type = tsExport.export["time_emails"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      {
+        label: browser.i18n.getMessage("Weekdays"), 
+        onClick: async () => {
+          let export_define = browser.i18n.getMessage("CustomQry");
+          let export_type = tsExport.export["weekdays"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      {
+        label: browser.i18n.getMessage("Folders"),
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("CustomQry");
+          let export_type = tsExport.export["folders"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      {
+        label: browser.i18n.getMessage("Tags"), 
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("CustomQry");
+          let export_type = tsExport.export["tags"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      {
+        label: browser.i18n.getMessage("Domains"), 
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("CustomQry");
+          let export_type = tsExport.export["domains"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+    ],
+    "tab-customqry-single-day": [
+      { 
+        label: browser.i18n.getMessage("Correspondents"), 
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("CustomQry");
+          let export_type = tsExport.export["correspondents"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      { 
+        label: browser.i18n.getMessage("MailsInADay"), 
+        onClick: async () => {
+          let export_define = browser.i18n.getMessage("Day") + tsUtils.dateToYYYYMMDD(singleDay.value);
+          let export_type = tsExport.export["time_emails"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      {
+        label: browser.i18n.getMessage("Folders"),
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("Day") + tsUtils.dateToYYYYMMDD(singleDay.value);
+          let export_type = tsExport.export["folders"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      {
+        label: browser.i18n.getMessage("Tags"), 
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("Day") + tsUtils.dateToYYYYMMDD(singleDay.value);
+          let export_type = tsExport.export["tags"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+      {
+        label: browser.i18n.getMessage("Domains"), 
+        onClick: () => {
+          let export_define = browser.i18n.getMessage("Day") + tsUtils.dateToYYYYMMDD(singleDay.value);
+          let export_type = tsExport.export["domains"].type;
+          exportData(export_data.value[export_type], export_type, export_define + "_" + tsExport.export[export_type].name)
+        }
+      },
+    ],
+    //========================================== CustomQry Tab - END
 };
 
 
@@ -230,15 +363,43 @@ function exportData(data, export_type, export_name) {
             tsExport.downloadCSV(output_data, export_name);
           break;
         case 'daily_mails':
-          //console.log(">>>>>>> exportData daily_mails: " + JSON.stringify(data));
-          let output_data_daily_mails = tsExport.transformDailyMailsJsonToArray(data);
-          //console.log(">>>>>>>> output_data_daily_mails: " + JSON.stringify(output_data_daily_mails));
+          // console.log(">>>>>>> exportData daily_mails: " + JSON.stringify(data));
+          let output_data_daily_mails = tsExport.transformPeriodMailsJsonToArray(data, "YYYYMMDD");
+          // console.log(">>>>>>>> output_data_daily_mails: " + JSON.stringify(output_data_daily_mails));
           tsExport.downloadCSV(output_data_daily_mails, export_name);
           break;
+        case 'weekly_mails':
+          let output_data_weekly_mails = tsExport.transformPeriodMailsJsonToArray(data, "YYYYWW");
+          tsExport.downloadCSV(output_data_weekly_mails, export_name);
+          break;
+        case 'monthly_mails':
+          let output_data_monthly_mails = tsExport.transformPeriodMailsJsonToArray(data, "YYYYMM");
+          tsExport.downloadCSV(output_data_monthly_mails, export_name);
+          break;
+        case 'yearly_mails':
+          let output_data_yearly_mails = tsExport.transformPeriodMailsJsonToArray(data, "YYYY");
+          tsExport.downloadCSV(output_data_yearly_mails, export_name);
+          break;
         case "time_emails":
           let output_data_time_emails = tsExport.transformTimeMailsJsonToArray(data);
           tsExport.downloadCSV(output_data_time_emails, export_name);
           break;
+        case "weekdays":
+          let output_data_weekdays = tsExport.transformWeekdaysJsonToArray(data);
+          tsExport.downloadCSV(output_data_weekdays, export_name);
+          break;
+        case "tags":
+          let output_data_tags = tsExport.transformTagsJsonToArray(data);
+          tsExport.downloadCSV(output_data_tags, export_name);
+          break;
+        case "folders":
+          let output_data_folders = tsExport.transformFoldersJsonToArray(data);
+          tsExport.downloadCSV(output_data_folders, export_name);
+          break;
+        case "domains":
+          let output_data_domains = tsExport.transformDomainsJsonToArray(data);
+          tsExport.downloadCSV(output_data_domains, export_name);
+          break;
         default: alert("export error: " + export_type);
           break;
     }
diff --git a/src/components/charts/ChartInboxZeroFolders.vue b/src/components/charts/ChartInboxZeroFolders.vue
index a8d4e3e2..5cb33f23 100644
--- a/src/components/charts/ChartInboxZeroFolders.vue
+++ b/src/components/charts/ChartInboxZeroFolders.vue
@@ -37,7 +37,6 @@ import { Doughnut } from 'vue-chartjs'
 import { Chart as ChartJS, ArcElement, Tooltip, Legend, Colors } from 'chart.js'
 import { tsDoughnutLabelsLine } from '@statslib/chartjs-lib/plugin-doughnutlabels';
 import { tsStore } from '@statslib/mzts-store';
-import { tsCoreUtils } from '@statslib/mzts-statscore.utils';
 
 
 ChartJS.register(ArcElement, Tooltip, Legend, Colors);
diff --git a/src/components/options_tabs/OPTAB_Info.vue b/src/components/options_tabs/OPTAB_Info.vue
index 8b36e966..307d4bbd 100644
--- a/src/components/options_tabs/OPTAB_Info.vue
+++ b/src/components/options_tabs/OPTAB_Info.vue
@@ -21,6 +21,16 @@
 <template>
     <OptionDonationHeader />
     <div>
+      <h3>Version 2.3.1 - 25/11/2024</h3>
+      <ul>
+        <li>In the Custom View now it's also possible to manually write the date in the datepicker. The two dates must be separated by "<i>space hyphen space</i>", " - ".</li>
+        <li>Now it's possible to extract all the new charts data (tags, folder, domains) and all the Custom View periods (daily, weekly, monthly, yearly mails) [<a href="https://github.com/micz/ThunderStats/issues/394">#394</a>].</li>
+        <li>Inbox Zero Date Chart tooltip is now visible again [<a href="https://github.com/micz/ThunderStats/issues/392">#392</a>].</li>
+        <li>Custom View sent and received charts day view has now a max width of 30.000 pixels, so it's visible also when querying hundreds of days [<a href="https://github.com/micz/ThunderStats/issues/390">#390</a>].</li>
+        <li>Custom View export menu is now correctly updated [<a href="https://github.com/micz/ThunderStats/issues/393">#393</a>].</li>
+        <li>Preventing concurrent data querying in the Custom View under some circumstances.</li>
+        <li>Some buttons graphic and positioning improved.</li>
+      </ul>
       <h1>ThunderStats Release Notes</h1>
       <h3>Version 2.3.0 - 17/11/2024</h3>
       <ul>
diff --git a/src/components/tabs/TAB_CustomQry.vue b/src/components/tabs/TAB_CustomQry.vue
index 67187137..d3a0156b 100644
--- a/src/components/tabs/TAB_CustomQry.vue
+++ b/src/components/tabs/TAB_CustomQry.vue
@@ -24,7 +24,7 @@
             <div id="customqry_menu">
                 <img src="@/assets/images/mzts-customqry-view.png" @click="openBookmarkMenu" @contextmenu="openBookmarkMenu" title="__MSG_Bookmarks_Menu__" class="bookmarkmenu"/>
             </div>
-                <span style="margin: 0px 10px;">__MSG_DateRange__</span> <VueDatePicker v-model="dateQry" @update:model-value="rangeChoosen" :dark="isDark" :format="datepickerFormat" :locale="prefLocale" :range="{ partialRange: false }" :max-date="new Date()" :multi-calendars="{ solo: false, static: true }" :enable-time-picker="false" :clearable="false" ></VueDatePicker>
+                <span style="margin: 0px 10px;">__MSG_DateRange__</span> <VueDatePicker v-model="dateQry" @update:model-value="rangeChoosen" :dark="isDark" :format="datepickerFormat" :locale="prefLocale" :range="{ partialRange: false }" :max-date="new Date()" :multi-calendars="{ solo: false, static: true }" :enable-time-picker="false" :clearable="false" :text-input="{ selectOnFocus: true, enterSubmit: true, tabSubmit: false }" ></VueDatePicker>
                 <img :src="advanced_filters_icon" @click="toggleAdvancedFilters" title="__MSG_ShowAdvFilters__" class="filters_btn"/>
                 <button type="button" id="customqry_update_btn" @click="update">__MSG_UpdateCustomQry__</button>
                 <input type="checkbox" id="customqry_only_bd" v-model="doOnlyBD" :disabled="customqry_only_bd_disabled" /> __MSG_OnlyBDCustomQry__
@@ -201,7 +201,7 @@ import WidgetInboxZero from '../widgets/WidgetInboxZero.vue';
 import WidgetFoldersTags from '../widgets/WidgetFoldersTags.vue';
 
 
-const emit = defineEmits(['updateCustomQry'],['updateElapsed']['customQryUserCancelled']);
+const emit = defineEmits(['updateCustomQry'],['updateElapsed'],['customQryUserCancelled']);
 
 const props = defineProps({
     accountEmails: {
@@ -219,6 +219,7 @@ let showMonths_btn_ref = ref(null);
 let showYears_btn_ref = ref(null);
 
 let max_direct_accounts = 1;
+let doing_update = false;
 
 let tsLog = null;
 var tsCore = null;
@@ -445,29 +446,29 @@ let elapsed = {
 
 let job_done = computed(() => {
   if(!do_single_day.value){
-    return !(is_loading_counter_sent_rcvd.value &&
-    is_loading_counter_customqry.value &&
-    is_loading_involved_table_recipients.value &&
-    is_loading_involved_table_senders.value &&
-    is_loading_sent_chart.value &&
-    is_loading_rcvd_chart.value &&
-    is_loading_timeday_chart.value &&
-    is_loading_weekdays_chart.value &&
-    is_loading_domains_chart.value &&
-    is_loading_tags_chart.value &&
-    is_loading_folders_chart.value);
+    return !is_loading_counter_sent_rcvd.value &&
+    !is_loading_counter_customqry.value &&
+    !is_loading_involved_table_recipients.value &&
+    !is_loading_involved_table_senders.value &&
+    !is_loading_sent_chart.value &&
+    !is_loading_rcvd_chart.value &&
+    !is_loading_timeday_chart.value &&
+    !is_loading_weekdays_chart.value &&
+    !is_loading_domains_chart.value &&
+    !is_loading_tags_chart.value &&
+    !is_loading_folders_chart.value;
   }else{
-    return !(is_loading_counter_sent_rcvd.value &&
-    is_loading_singleday_chart.value &&
-    is_loading_involved_table_recipients.value &&
-    is_loading_involved_table_senders.value &&
-    is_loading_counter_inbox.value &&
-    is_loading_counter_inbox_percent.value &&
-    is_loading_inbox_chart_folders.value &&
-    is_loading_inbox_chart_dates.value &&
-    is_loading_domains_chart.value &&
-    is_loading_tags_chart.value &&
-    is_loading_folders_chart.value);
+    return !is_loading_counter_sent_rcvd.value &&
+    !is_loading_singleday_chart.value &&
+    !is_loading_involved_table_recipients.value &&
+    !is_loading_involved_table_senders.value &&
+    !is_loading_counter_inbox.value &&
+    !is_loading_counter_inbox_percent.value &&
+    !is_loading_inbox_chart_folders.value &&
+    !is_loading_inbox_chart_dates.value &&
+    !is_loading_domains_chart.value &&
+    !is_loading_tags_chart.value &&
+    !is_loading_folders_chart.value;
   }
 });
 
@@ -566,6 +567,12 @@ onMounted(async () => {
 });
 
 function update(){
+  if(doing_update){
+    tsLog.log("Update already in progress...");
+    return;
+  }
+  doing_update = true;
+  // console.log(">>>>>>>>>>> TAB_CustomQry update");
   tsLog.log("Update requested");
   emit('updateCustomQry');
 }
@@ -726,6 +733,7 @@ async function setPeriod(period){
             break;
     }
     if(await tsPrefs.getPref("customqry_loaddata_when_selectingrange")){
+      // console.log(">>>>>>>>>>>>>> customqry_loaddata_when_selectingrange do update");
       update();
     }
 }
@@ -737,9 +745,10 @@ async function doQry(){
   let pref_warn_days = await tsPrefs.getPref("customqry_warn_onlongperiod_days");
   if(pref_warn_days > 0 && customqry_totaldays_num.value > pref_warn_days){
     if(!confirm(browser.i18n.getMessage("CustomViewTooMuchDaysText",customqry_totaldays_num.value))){
+      // console.log(">>>>>>>>>>>>> CustomQry cancelled");
       do_run.value = false;
-      customqry_totaldays_num.value = 0;
       emit('customQryUserCancelled');
+      doing_update = false;
       return;
     }
   }
@@ -747,6 +756,7 @@ async function doQry(){
   chartdata_type.value = "YYYYMMDD";
   do_single_day.value = (customqry_totaldays_num.value == 1);
   elapsed.getInboxZeroData = 1;
+  tabId.value = "tab-customqry";
   if(do_single_day.value){
     tsLog.log("Doing single day view...");
     tabId.value = "tab-customqry-single-day";
@@ -770,6 +780,7 @@ async function doQry(){
 function setChartWidth(){
   let chart_container_width = document.querySelector('.chart_customqry').clientWidth;
   let chart_ipotetic_width = chartData_Rcvd.value.labels.length * 60;
+  if(chart_ipotetic_width > 30000) chart_ipotetic_width = 30000;
   if(chart_container_width < chart_ipotetic_width){
     chart_width.value = String(chart_ipotetic_width) + "px";
   } else {
@@ -1072,10 +1083,16 @@ async function updateData() {
             // export data
             if(!do_single_day.value){
               _export_data.value[tsExport.export.daily_mails.type] = result_customqry.dates;
-            }else{
-              _export_data.value[tsExport.export.time_emails.type] = result_customqry.msg_hours;
+              _export_data.value[tsExport.export.weekdays.type] = result_customqry.msg_weekdays;
+              _export_data.value[tsExport.export.weekly_mails.type] = result_customqry.dates_weeks;
+              _export_data.value[tsExport.export.monthly_mails.type] = result_customqry.dates_months;
+              _export_data.value[tsExport.export.yearly_mails.type] = result_customqry.dates_years;
             }
+            _export_data.value[tsExport.export.time_emails.type] = result_customqry.msg_hours;
             _export_data.value[tsExport.export.correspondents.type] = tsExport.mergeRecipientsAndSenders(result_customqry.senders, result_customqry.recipients);
+            _export_data.value[tsExport.export.tags.type] = result_customqry.tags;
+            _export_data.value[tsExport.export.folders.type] = result_customqry.folders;
+            _export_data.value[tsExport.export.domains.type] = result_customqry.domains;
             //top senders list
             show_table_involved_senders.value =  Object.keys(result_customqry.senders).length > 0;
             table_involved_senders.value = result_customqry.senders;
@@ -1181,6 +1198,7 @@ async function updateData() {
             is_loading_tags_chart.value = false;
             let stop_time = performance.now();
             updateElapsed('getCustomQryData', stop_time - start_time);
+            doing_update = false;
             resolve(true);
         });
     };
diff --git a/src/components/tabs/TAB_ManyDays.vue b/src/components/tabs/TAB_ManyDays.vue
index 895e713f..ea53ae91 100644
--- a/src/components/tabs/TAB_ManyDays.vue
+++ b/src/components/tabs/TAB_ManyDays.vue
@@ -153,7 +153,6 @@ let chartdata_tags_rcvd = ref([]);
 let chartdata_tags_labels = ref([]);
 
 let domains_chart_height = ref("275px");
-let tags_chart_height = ref("275px");
 
 let _export_data = ref({});
 
@@ -202,17 +201,17 @@ let chartData_Tags = ref({
 });
 
 let job_done = computed(() => {
-    return !(is_loading_counter_sent_rcvd.value &&
-    is_loading_counter_many_days.value &&
-    is_loading_involved_table_recipients.value &&
-    is_loading_involved_table_senders.value &&
-    is_loading_sent_chart.value &&
-    is_loading_rcvd_chart.value &&
-    is_loading_timeday_chart.value &&
-    is_loading_weekdays_chart.value &&
-    is_loading_domains_chart.value &&
-    is_loading_tags_chart.value &&
-    is_loading_folders_chart.value);
+    return !is_loading_counter_sent_rcvd.value &&
+    !is_loading_counter_many_days.value &&
+    !is_loading_involved_table_recipients.value &&
+    !is_loading_involved_table_senders.value &&
+    !is_loading_sent_chart.value &&
+    !is_loading_rcvd_chart.value &&
+    !is_loading_timeday_chart.value &&
+    !is_loading_weekdays_chart.value &&
+    !is_loading_domains_chart.value &&
+    !is_loading_tags_chart.value &&
+    !is_loading_folders_chart.value;
 });
 
 onMounted(async () => {
@@ -395,8 +394,13 @@ async function updateData() {
             let result_many_days = await tsCore.getManyDaysData(tsStore.current_account_id, props.accountEmails);
             tsLog.log("result_manydays_data: " + JSON.stringify(result_many_days, null, 2));
             // export data
+            _export_data.value[tsExport.export.time_emails.type] = result_many_days.msg_hours;
             _export_data.value[tsExport.export.daily_mails.type] = result_many_days.dates;
             _export_data.value[tsExport.export.correspondents.type] = tsExport.mergeRecipientsAndSenders(result_many_days.senders, result_many_days.recipients);
+            _export_data.value[tsExport.export.tags.type] = result_many_days.tags;
+            _export_data.value[tsExport.export.folders.type] = result_many_days.folders;
+            _export_data.value[tsExport.export.domains.type] = result_many_days.domains;
+            _export_data.value[tsExport.export.weekdays.type] = result_many_days.msg_weekdays;
             //top senders list
             show_table_involved_senders.value =  Object.keys(result_many_days.senders).length > 0;
             table_involved_senders.value = result_many_days.senders;
diff --git a/src/components/tabs/TAB_Today.vue b/src/components/tabs/TAB_Today.vue
index 500bf4d1..37c0632d 100644
--- a/src/components/tabs/TAB_Today.vue
+++ b/src/components/tabs/TAB_Today.vue
@@ -223,19 +223,19 @@ let chartdata_tags_labels = ref([]);
 let domains_chart_height = ref("275px");
 
 let job_done = computed(() => {
-    return !(is_loading_counter_sent_rcvd.value &&
-    is_loading_counter_yesterday_thistime.value &&
-    is_loading_counter_many_days.value &&
-    is_loading_today_chart.value &&
-    is_loading_involved_table_recipients.value &&
-    is_loading_involved_table_senders.value &&
-    is_loading_counter_inbox.value &&
-    is_loading_counter_inbox_percent.value &&
-    is_loading_inbox_chart_folders.value &&
-    is_loading_inbox_chart_dates.value &&
-    is_loading_domains_chart.value &&
-    is_loading_tags_chart.value &&
-    is_loading_folders_chart.value);
+    return !is_loading_counter_sent_rcvd.value &&
+    !is_loading_counter_yesterday_thistime.value &&
+    !is_loading_counter_many_days.value &&
+    !is_loading_today_chart.value &&
+    !is_loading_involved_table_recipients.value &&
+    !is_loading_involved_table_senders.value &&
+    !is_loading_counter_inbox.value &&
+    !is_loading_counter_inbox_percent.value &&
+    !is_loading_inbox_chart_folders.value &&
+    !is_loading_inbox_chart_dates.value &&
+    !is_loading_domains_chart.value &&
+    !is_loading_tags_chart.value &&
+    !is_loading_folders_chart.value;
 })
 
 onMounted(async () => {
@@ -419,6 +419,9 @@ async function updateData() {
             // export data
             _export_data.value[tsExport.export.time_emails.type] = result_today.msg_hours;
             _export_data.value[tsExport.export.correspondents.type] = tsExport.mergeRecipientsAndSenders(result_today.senders, result_today.recipients);
+            _export_data.value[tsExport.export.tags.type] = result_today.tags;
+            _export_data.value[tsExport.export.folders.type] = result_today.folders;
+            _export_data.value[tsExport.export.domains.type] = result_today.domains;
             // chart today hours
             const today_hours_data = tsCoreUtils.transformCountDataToDataset(result_today.msg_hours, do_progressive);
             let pref_today_time_chart_do_no_show_future = await tsPrefs.getPref("today_time_chart_do_no_show_future");
diff --git a/src/components/tabs/TAB_Yesterday.vue b/src/components/tabs/TAB_Yesterday.vue
index 242311af..6d9eb92b 100644
--- a/src/components/tabs/TAB_Yesterday.vue
+++ b/src/components/tabs/TAB_Yesterday.vue
@@ -213,18 +213,18 @@ let chartdata_tags_labels = ref([]);
 let domains_chart_height = ref("275px");
 
 let job_done = computed(() => {
-    return !(is_loading_counter_sent_rcvd.value &&
-    is_loading_yesterday_chart.value &&
-    is_loading_involved_table_recipients.value &&
-    is_loading_involved_table_senders.value &&
-    is_loading_counter_inbox.value &&
-    is_loading_counter_inbox_percent.value &&
-    is_loading_inbox_chart_folders.value &&
-    is_loading_inbox_chart_dates.value &&
-    is_loading_counter_many_days.value &&
-    is_loading_domains_chart.value &&
-    is_loading_tags_chart.value &&
-    is_loading_folders_chart.value);
+    return !is_loading_counter_sent_rcvd.value &&
+    !is_loading_yesterday_chart.value &&
+    !is_loading_involved_table_recipients.value &&
+    !is_loading_involved_table_senders.value &&
+    !is_loading_counter_inbox.value &&
+    !is_loading_counter_inbox_percent.value &&
+    !is_loading_inbox_chart_folders.value &&
+    !is_loading_inbox_chart_dates.value &&
+    !is_loading_counter_many_days.value &&
+    !is_loading_domains_chart.value &&
+    !is_loading_tags_chart.value &&
+    !is_loading_folders_chart.value;
 })
 
 onMounted(async () => {
@@ -399,6 +399,9 @@ async function updateData() {
             // export data
             _export_data.value[tsExport.export.time_emails.type] = result_yesterday.msg_hours;
             _export_data.value[tsExport.export.correspondents.type] = tsExport.mergeRecipientsAndSenders(result_yesterday.senders, result_yesterday.recipients);
+            _export_data.value[tsExport.export.tags.type] = result_yesterday.tags;
+            _export_data.value[tsExport.export.folders.type] = result_yesterday.folders;
+            _export_data.value[tsExport.export.domains.type] = result_yesterday.domains;
             // chart yesterday hours
             const yesterday_hours_data = tsCoreUtils.transformCountDataToDataset(result_yesterday.msg_hours, do_progressive);
             chartdata_yesterday_hours_sent.value = yesterday_hours_data.dataset_sent;
diff --git a/src/components/widgets/WidgetFoldersTags.vue b/src/components/widgets/WidgetFoldersTags.vue
index 82f7519d..41fc15b0 100644
--- a/src/components/widgets/WidgetFoldersTags.vue
+++ b/src/components/widgets/WidgetFoldersTags.vue
@@ -23,7 +23,7 @@
     <div class="list_heading_wrapper">
         <h2 class="list_heading cropped lowercase">{{ show_tags ? '__MSG_Tags__&nbsp;&nbsp;' : '__MSG_Folders__' }}</h2>
         <div class="spacer" style="max-width:4.5em;"></div>
-        <div class="btn_group" ><button type="button" @click="doSwitch" v-if="!(is_loading_folders || is_loading_tags)" class="btn_small btn_small_single" v-text="switch_text"></button></div>
+        <div class="btn_group" ><button type="button" @click="doSwitch" v-if="!(is_loading_folders || is_loading_tags)" class="btn_small btn_small_single btn_pos_3" v-text="switch_text"></button></div>
         <div class="spacer"></div>
     </div>
     <ChartFolders v-if="!show_tags" :chartData="chartDataFolders" :chart_id="chart_id_folders" :chart_height="chart_height_folders" :is_loading="is_loading_folders" :key="chart_key" />
diff --git a/src/components/widgets/WidgetInboxZero.vue b/src/components/widgets/WidgetInboxZero.vue
index 48374bb1..0c918bf4 100644
--- a/src/components/widgets/WidgetInboxZero.vue
+++ b/src/components/widgets/WidgetInboxZero.vue
@@ -41,7 +41,7 @@
           :chartData="chartData_InboxZeroDates" 
           :is_loading="is_loading_inbox_chart_dates"
         />
-        <div class="chart_inbox0_extended_btn" ><button type="button" @click="doShowExtended" v-if="!is_loading_inbox_chart_folders" class="btn" >__MSG_ViewDetails__</button></div>
+        <div class="chart_inbox0_extended_btn" ><button type="button" @click="doShowExtended" v-if="!is_loading_inbox_chart_folders" class="btn_small btn_small_single" >__MSG_ViewDetails__</button></div>
       </div>
       <table class="chart_inbox0_extended_table" v-if="show_extended">
         <tr>
@@ -61,7 +61,7 @@
           :key = "key"
         />
       </div>
-      <div class="chart_inbox0_extended_close_btn" v-if="show_extended"><button type="button" @click="doHideExtended" class="btn" >__MSG_Close__</button></div>
+      <div class="chart_inbox0_extended_close_btn" v-if="show_extended"><button type="button" @click="doHideExtended" class="btn_small btn_small_single" >__MSG_Close__</button></div>
     </div>
 </template>
 
diff --git a/statslib/chartjs-lib/external-tooltip-inboxzerodates.js b/statslib/chartjs-lib/external-tooltip-inboxzerodates.js
index c4ccf4c2..2ee73a75 100644
--- a/statslib/chartjs-lib/external-tooltip-inboxzerodates.js
+++ b/statslib/chartjs-lib/external-tooltip-inboxzerodates.js
@@ -17,8 +17,8 @@
  */
 
 const getOrCreateTooltip = (chart) => {
-    let tooltipEl = chart.canvas.parentNode.querySelector('div');
-  
+    let tooltipEl = chart.canvas.parentNode.querySelector('div.tooltip-light');
+
     if (!tooltipEl) {
       tooltipEl = document.createElement('div');
       tooltipEl.classList.add('tooltip-light');
diff --git a/statslib/mzts-export.js b/statslib/mzts-export.js
index 09779b95..d5eef140 100644
--- a/statslib/mzts-export.js
+++ b/statslib/mzts-export.js
@@ -17,6 +17,7 @@
  */
 
 import { tsCoreUtils } from '@statslib/mzts-statscore.utils';
+import { tsStore } from '@statslib/mzts-store';
 
 export const tsExport = {
 
@@ -33,6 +34,34 @@ export const tsExport = {
             type: 'daily_mails',
             name: 'Daily Emails',
         },
+        weekly_mails: {
+            type: 'weekly_mails',
+            name: 'Weekly Emails',
+        },
+        monthly_mails: {
+            type: 'monthly_mails',
+            name: 'Monthly Emails',
+        },
+        yearly_mails: {
+            type: 'yearly_mails',
+            name: 'Yearly Emails',
+        },
+        weekdays: {
+            type: 'weekdays',
+            name: 'Weekdays',
+        },
+        tags: {
+            type: 'tags',
+            name: 'Tags',
+        },
+        folders: {
+            type: 'folders',
+            name: 'Folders',
+        },
+        domains: {
+            type: 'domains',
+            name: 'Domains',
+        },
     },
 
     getExportPrefix() {
@@ -150,18 +179,34 @@ export const tsExport = {
         return resultArray;
     },
 
-    transformDailyMailsJsonToArray(json) {
+    transformPeriodMailsJsonToArray(json, data_type) {
         let resultArray = [];
 
-        const dateKey = browser.i18n.getMessage('Date');
+        let dateKey = "";
+
+        switch(data_type) {
+            case 'YYYYMMDD':
+                dateKey = browser.i18n.getMessage('Date');
+                break;
+            case 'YYYYWW':
+                dateKey = browser.i18n.getMessage('Week') + " [" + browser.i18n.getMessage('Year') + "]";
+                break;
+            case 'YYYYMM':
+                dateKey = browser.i18n.getMessage('Month');
+                break;
+            case 'YYYY':
+                dateKey = browser.i18n.getMessage('Year');
+                break;
+        }
+        
         const sentKey = browser.i18n.getMessage('TimeChart.Sent');
         const rcvdKey = browser.i18n.getMessage('TimeChart.Rcvd');
     
         for (let date in json) {
             let mailData = json[date];
             const obj = {};
-            let formatted_date = tsCoreUtils.getManyDaysLabel(date);
-            obj[dateKey] = formatted_date[1];
+            let formatted_date = tsCoreUtils.getCustomQryLabel(date, data_type);
+            obj[dateKey] = formatted_date;
             obj[sentKey] = mailData.sent;
             obj[rcvdKey] = mailData.received;
             
@@ -191,4 +236,84 @@ export const tsExport = {
     
         return resultArray;
     },
+
+    transformTagsJsonToArray(json) {
+        let resultArray = [];
+
+        const tagKey = browser.i18n.getMessage('Tags');
+        const sentKey = browser.i18n.getMessage('TimeChart.Sent');
+        const rcvdKey = browser.i18n.getMessage('TimeChart.Rcvd');
+    
+        for (let tag in json) {
+            let mailData = json[tag];
+            const obj = {};
+            obj[tagKey] =  tsStore.tags_list[tag].tag;
+            obj[sentKey] = mailData.sent;
+            obj[rcvdKey] = mailData.received;
+            
+            resultArray.push(obj);
+        }
+
+        return resultArray;
+    },
+
+    transformFoldersJsonToArray(json) {
+        let resultArray = [];
+
+        const tagKey = browser.i18n.getMessage('Folders');
+        const sentKey = browser.i18n.getMessage('TimeChart.Sent');
+        const rcvdKey = browser.i18n.getMessage('TimeChart.Rcvd');
+    
+        for (let folder in json) {
+            let mailData = json[folder];
+            const obj = {};
+            obj[tagKey] = tsCoreUtils.getFolderPath(folder);
+            obj[sentKey] = mailData.sent;
+            obj[rcvdKey] = mailData.received;
+            
+            resultArray.push(obj);
+        }
+    
+        return resultArray;
+    },
+
+    transformDomainsJsonToArray(json) {
+        let resultArray = [];
+
+        const tagKey = browser.i18n.getMessage('Domains');
+        const sentKey = browser.i18n.getMessage('TimeChart.Sent');
+        const rcvdKey = browser.i18n.getMessage('TimeChart.Rcvd');
+    
+        for (let domain in json) {
+            let mailData = json[domain];
+            const obj = {};
+            obj[tagKey] = domain;
+            obj[sentKey] = mailData.sent;
+            obj[rcvdKey] = mailData.received;
+            
+            resultArray.push(obj);
+        }
+    
+        return resultArray;
+    },
+
+    transformWeekdaysJsonToArray(json) {
+        let resultArray = [];
+
+        const tagKey = browser.i18n.getMessage('Weekdays');
+        const sentKey = browser.i18n.getMessage('TimeChart.Sent');
+        const rcvdKey = browser.i18n.getMessage('TimeChart.Rcvd');
+    
+        for (let weekday in json) {
+            let mailData = json[weekday];
+            const obj = {};
+            obj[tagKey] = browser.i18n.getMessage('WeekDay'+weekday);
+            obj[sentKey] = mailData.sent;
+            obj[rcvdKey] = mailData.received;
+            
+            resultArray.push(obj);
+        }
+    
+        return resultArray;
+    },
 }
\ No newline at end of file