diff --git a/dev/View/Popup/AdvancedSearch.js b/dev/View/Popup/AdvancedSearch.js
index d3b084bbe..64dc6bf9a 100644
--- a/dev/View/Popup/AdvancedSearch.js
+++ b/dev/View/Popup/AdvancedSearch.js
@@ -18,7 +18,7 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
 			text: '',
 			keyword: '',
 			repliedValue: -1,
-			selectedDateValue: -1,
+			selectedDateValue: 0,
 			selectedTreeValue: '',
 
 			hasAttachment: false,
@@ -55,9 +55,9 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
 
 			selectedDates: () => {
 				translateTrigger();
-				let prefix = 'SEARCH/DATE_';
+				let prefix = 'SEARCH/SINCE_';
 				return [
-					{ id: -1, name: i18n(prefix + 'ALL') },
+					{ id: 0, name: i18n('SEARCH/DATE_ALL') },
 					{ id: 3, name: i18n(prefix + '3_DAYS') },
 					{ id: 7, name: i18n(prefix + '7_DAYS') },
 					{ id: 30, name: i18n(prefix + 'MONTH') },
@@ -100,7 +100,7 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
 		append('text', self.text().trim());
 		append('keyword', self.keyword());
 		append('in', self.selectedTreeValue());
-		if (-1 < self.selectedDateValue()) {
+		if (0 < self.selectedDateValue()) {
 			let d = new Date();
 			d.setDate(d.getDate() - self.selectedDateValue());
 			append('since', d.toISOString().split('T')[0]);
@@ -136,8 +136,7 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
 		self.text(pString(params.get('text')));
 		self.keyword(pString(params.get('keyword')));
 		self.selectedTreeValue(pString(params.get('in')));
-//		self.selectedDateValue(params.get('since'));
-		self.selectedDateValue(-1);
+		self.selectedDateValue(0);
 		self.hasAttachment(params.has('attachment'));
 		self.starred(params.has('flagged'));
 		self.unseen(params.has('unseen'));
diff --git a/snappymail/v/0.0.0/app/localization/ar/user.json b/snappymail/v/0.0.0/app/localization/ar/user.json
index 3380bc39b..04cc8a010 100644
--- a/snappymail/v/0.0.0/app/localization/ar/user.json
+++ b/snappymail/v/0.0.0/app/localization/ar/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "لم يقرأ",
 		"DATE": "التاريخ",
 		"DATE_ALL": "الكل",
-		"DATE_3_DAYS": "منذ 3 أيام",
-		"DATE_7_DAYS": "منذ أسبوع",
-		"DATE_MONTH": "منذ شهر",
-		"DATE_3_MONTHS": "منذ 3 أشهر",
-		"DATE_6_MONTHS": "منذ 6 أشهر",
-		"DATE_YEAR": "منذ سنة",
+		"SINCE_3_DAYS": "منذ 3 أيام",
+		"SINCE_7_DAYS": "منذ أسبوع",
+		"SINCE_MONTH": "منذ شهر",
+		"SINCE_3_MONTHS": "منذ 3 أشهر",
+		"SINCE_6_MONTHS": "منذ 6 أشهر",
+		"SINCE_YEAR": "منذ سنة",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/be/user.json b/snappymail/v/0.0.0/app/localization/be/user.json
index 80de12487..ef91525b8 100644
--- a/snappymail/v/0.0.0/app/localization/be/user.json
+++ b/snappymail/v/0.0.0/app/localization/be/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Непрачытаныя",
 		"DATE": "Дата",
 		"DATE_ALL": "За ўвесь час",
-		"DATE_3_DAYS": "За тры дні",
-		"DATE_7_DAYS": "За тыдзень",
-		"DATE_MONTH": "За месяц",
-		"DATE_3_MONTHS": "За 3 месяцы",
-		"DATE_6_MONTHS": "За паўгода",
-		"DATE_YEAR": "За год",
+		"SINCE_3_DAYS": "За тры дні",
+		"SINCE_7_DAYS": "За тыдзень",
+		"SINCE_MONTH": "За месяц",
+		"SINCE_3_MONTHS": "За 3 месяцы",
+		"SINCE_6_MONTHS": "За паўгода",
+		"SINCE_YEAR": "За год",
 		"SUBFOLDERS": "Падкаталогі",
 		"SUBFOLDERS_NONE": "Нічога",
 		"SUBFOLDERS_SUBTREE": "Усе",
diff --git a/snappymail/v/0.0.0/app/localization/bg/user.json b/snappymail/v/0.0.0/app/localization/bg/user.json
index eda2431bd..732cd817f 100644
--- a/snappymail/v/0.0.0/app/localization/bg/user.json
+++ b/snappymail/v/0.0.0/app/localization/bg/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Невидяно",
 		"DATE": "Дата",
 		"DATE_ALL": "Всички",
-		"DATE_3_DAYS": "До 3 дена",
-		"DATE_7_DAYS": "До 1 седмица",
-		"DATE_MONTH": "До 1 месец",
-		"DATE_3_MONTHS": "До 3 месеца",
-		"DATE_6_MONTHS": "До 6 месеца",
-		"DATE_YEAR": "До 1 година",
+		"SINCE_3_DAYS": "До 3 дена",
+		"SINCE_7_DAYS": "До 1 седмица",
+		"SINCE_MONTH": "До 1 месец",
+		"SINCE_3_MONTHS": "До 3 месеца",
+		"SINCE_6_MONTHS": "До 6 месеца",
+		"SINCE_YEAR": "До 1 година",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/cs/user.json b/snappymail/v/0.0.0/app/localization/cs/user.json
index 18ee120c3..13f12f16b 100644
--- a/snappymail/v/0.0.0/app/localization/cs/user.json
+++ b/snappymail/v/0.0.0/app/localization/cs/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Nepřečtené",
 		"DATE": "Datum",
 		"DATE_ALL": "Kdykoliv",
-		"DATE_3_DAYS": "Ne starší než 3 dny",
-		"DATE_7_DAYS": "Ne starší než týden",
-		"DATE_MONTH": "Ne starší než měsíc",
-		"DATE_3_MONTHS": "Ne starší než 3 měsíce",
-		"DATE_6_MONTHS": "Ne starší než 6 měsíců",
-		"DATE_YEAR": "Ne starší než 1 rok",
+		"SINCE_3_DAYS": "Ne starší než 3 dny",
+		"SINCE_7_DAYS": "Ne starší než týden",
+		"SINCE_MONTH": "Ne starší než měsíc",
+		"SINCE_3_MONTHS": "Ne starší než 3 měsíce",
+		"SINCE_6_MONTHS": "Ne starší než 6 měsíců",
+		"SINCE_YEAR": "Ne starší než 1 rok",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/da/user.json b/snappymail/v/0.0.0/app/localization/da/user.json
index e5c0faf79..fde109519 100644
--- a/snappymail/v/0.0.0/app/localization/da/user.json
+++ b/snappymail/v/0.0.0/app/localization/da/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Ulæst",
 		"DATE": "Dato",
 		"DATE_ALL": "Alle",
-		"DATE_3_DAYS": "Nyere end 3 dage",
-		"DATE_7_DAYS": "Nyere end 1 uge",
-		"DATE_MONTH": "Nyere end 1 måned",
-		"DATE_3_MONTHS": "Nyere end 3 måneder",
-		"DATE_6_MONTHS": "Nyere end 6 måneder",
-		"DATE_YEAR": "Nyere end 1 år",
+		"SINCE_3_DAYS": "Nyere end 3 dage",
+		"SINCE_7_DAYS": "Nyere end 1 uge",
+		"SINCE_MONTH": "Nyere end 1 måned",
+		"SINCE_3_MONTHS": "Nyere end 3 måneder",
+		"SINCE_6_MONTHS": "Nyere end 6 måneder",
+		"SINCE_YEAR": "Nyere end 1 år",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/de/user.json b/snappymail/v/0.0.0/app/localization/de/user.json
index 2a035171c..2aaf55d7c 100644
--- a/snappymail/v/0.0.0/app/localization/de/user.json
+++ b/snappymail/v/0.0.0/app/localization/de/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Ungelesen",
 		"DATE": "Datum",
 		"DATE_ALL": "Alle",
-		"DATE_3_DAYS": "Nicht älter als 3 Tage",
-		"DATE_7_DAYS": "Nicht älter als 1 Woche",
-		"DATE_MONTH": "Nicht älter als 1 Monat",
-		"DATE_3_MONTHS": "Nicht älter als 3 Monate",
-		"DATE_6_MONTHS": "Nicht älter als 6 Monate",
-		"DATE_YEAR": "Nicht älter als 1 Jahr",
+		"SINCE_3_DAYS": "Nicht älter als 3 Tage",
+		"SINCE_7_DAYS": "Nicht älter als 1 Woche",
+		"SINCE_MONTH": "Nicht älter als 1 Monat",
+		"SINCE_3_MONTHS": "Nicht älter als 3 Monate",
+		"SINCE_6_MONTHS": "Nicht älter als 6 Monate",
+		"SINCE_YEAR": "Nicht älter als 1 Jahr",
 		"SUBFOLDERS": "Unterordner",
 		"SUBFOLDERS_NONE": "Keine",
 		"SUBFOLDERS_SUBTREE": "Alle",
diff --git a/snappymail/v/0.0.0/app/localization/el/user.json b/snappymail/v/0.0.0/app/localization/el/user.json
index 5b18f8336..8e10deab0 100644
--- a/snappymail/v/0.0.0/app/localization/el/user.json
+++ b/snappymail/v/0.0.0/app/localization/el/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Δεν έχουν διαβαστεί",
 		"DATE": "Ημερομηνία",
 		"DATE_ALL": "Όλα",
-		"DATE_3_DAYS": "Έως 3 ημέρες πρίν",
-		"DATE_7_DAYS": "Έως 1 εβδομάδα πριν",
-		"DATE_MONTH": "Έως 1 μήνα πριν",
-		"DATE_3_MONTHS": "Έως 3 μήνες πριν",
-		"DATE_6_MONTHS": "Έως 6 μήνες πριν",
-		"DATE_YEAR": "Έως 1 χρόνο πριν",
+		"SINCE_3_DAYS": "Έως 3 ημέρες πρίν",
+		"SINCE_7_DAYS": "Έως 1 εβδομάδα πριν",
+		"SINCE_MONTH": "Έως 1 μήνα πριν",
+		"SINCE_3_MONTHS": "Έως 3 μήνες πριν",
+		"SINCE_6_MONTHS": "Έως 6 μήνες πριν",
+		"SINCE_YEAR": "Έως 1 χρόνο πριν",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/en/user.json b/snappymail/v/0.0.0/app/localization/en/user.json
index 813ff0d6a..40100067e 100644
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Unseen",
 		"DATE": "Date",
 		"DATE_ALL": "All",
-		"DATE_3_DAYS": "Up to 3 days old",
-		"DATE_7_DAYS": "Up to 1 week old",
-		"DATE_MONTH": "Up to 1 month old",
-		"DATE_3_MONTHS": "Up to 3 months old",
-		"DATE_6_MONTHS": "Up to 6 months old",
-		"DATE_YEAR": "Up to 1 year old",
+		"SINCE_3_DAYS": "Up to 3 days old",
+		"SINCE_7_DAYS": "Up to 1 week old",
+		"SINCE_MONTH": "Up to 1 month old",
+		"SINCE_3_MONTHS": "Up to 3 months old",
+		"SINCE_6_MONTHS": "Up to 6 months old",
+		"SINCE_YEAR": "Up to 1 year old",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/es/user.json b/snappymail/v/0.0.0/app/localization/es/user.json
index ce45058d0..87e859f42 100644
--- a/snappymail/v/0.0.0/app/localization/es/user.json
+++ b/snappymail/v/0.0.0/app/localization/es/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "No leído",
 		"DATE": "Fecha",
 		"DATE_ALL": "Todo",
-		"DATE_3_DAYS": "Hasta 3 días de antigüedad",
-		"DATE_7_DAYS": "Hasta una semana de antigüedad",
-		"DATE_MONTH": "Hasta 1 mes de antigüedad",
-		"DATE_3_MONTHS": "Hasta 3 meses de antigüedad",
-		"DATE_6_MONTHS": "Hasta 6 meses de antigüedad",
-		"DATE_YEAR": "Hasta 1 año de antigüedad",
+		"SINCE_3_DAYS": "Hasta 3 días de antigüedad",
+		"SINCE_7_DAYS": "Hasta una semana de antigüedad",
+		"SINCE_MONTH": "Hasta 1 mes de antigüedad",
+		"SINCE_3_MONTHS": "Hasta 3 meses de antigüedad",
+		"SINCE_6_MONTHS": "Hasta 6 meses de antigüedad",
+		"SINCE_YEAR": "Hasta 1 año de antigüedad",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/et/user.json b/snappymail/v/0.0.0/app/localization/et/user.json
index b46fcbde3..23e71b0a9 100644
--- a/snappymail/v/0.0.0/app/localization/et/user.json
+++ b/snappymail/v/0.0.0/app/localization/et/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Lugemata",
 		"DATE": "Kuupäev",
 		"DATE_ALL": "Kõik",
-		"DATE_3_DAYS": "Kuni 3 päeva vanune",
-		"DATE_7_DAYS": "Kuni 1 nädal vanune",
-		"DATE_MONTH": "Kuni 1 kuu vanune",
-		"DATE_3_MONTHS": "Kuni 3 kuu vanune ",
-		"DATE_6_MONTHS": "Kuni 6 kuu vanune",
-		"DATE_YEAR": "Kuni 1 aasta vanune",
+		"SINCE_3_DAYS": "Kuni 3 päeva vanune",
+		"SINCE_7_DAYS": "Kuni 1 nädal vanune",
+		"SINCE_MONTH": "Kuni 1 kuu vanune",
+		"SINCE_3_MONTHS": "Kuni 3 kuu vanune ",
+		"SINCE_6_MONTHS": "Kuni 6 kuu vanune",
+		"SINCE_YEAR": "Kuni 1 aasta vanune",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/eu/user.json b/snappymail/v/0.0.0/app/localization/eu/user.json
index ad269ed8f..699295a52 100644
--- a/snappymail/v/0.0.0/app/localization/eu/user.json
+++ b/snappymail/v/0.0.0/app/localization/eu/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Irakurri gabe",
 		"DATE": "Data",
 		"DATE_ALL": "Denak",
-		"DATE_3_DAYS": "3 egun arterakoak",
-		"DATE_7_DAYS": "Astebetako arterakoak",
-		"DATE_MONTH": "Hilabete arterakoak",
-		"DATE_3_MONTHS": "3 hilabete arterakoak",
-		"DATE_6_MONTHS": "6 hilabete arterakoak",
-		"DATE_YEAR": "Urtebete arterakoak",
+		"SINCE_3_DAYS": "3 egun arterakoak",
+		"SINCE_7_DAYS": "Astebetako arterakoak",
+		"SINCE_MONTH": "Hilabete arterakoak",
+		"SINCE_3_MONTHS": "3 hilabete arterakoak",
+		"SINCE_6_MONTHS": "6 hilabete arterakoak",
+		"SINCE_YEAR": "Urtebete arterakoak",
 		"SUBFOLDERS": "Azpikarpetak",
 		"SUBFOLDERS_NONE": "Bat ere ez",
 		"SUBFOLDERS_SUBTREE": "Denak",
diff --git a/snappymail/v/0.0.0/app/localization/fa/user.json b/snappymail/v/0.0.0/app/localization/fa/user.json
index 11b3ffbc2..8a5c6d0a8 100644
--- a/snappymail/v/0.0.0/app/localization/fa/user.json
+++ b/snappymail/v/0.0.0/app/localization/fa/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "خوانده نشده",
 		"DATE": "تاریخ",
 		"DATE_ALL": "همه",
-		"DATE_3_DAYS": "تا 3 روز گذشته",
-		"DATE_7_DAYS": "تا 1 هفته گذشته",
-		"DATE_MONTH": "تا 1 ماه گذشته",
-		"DATE_3_MONTHS": "تا 3 ماه گذشته",
-		"DATE_6_MONTHS": "تا 6 ماه گذشته",
-		"DATE_YEAR": "تا 1 سال گذشته",
+		"SINCE_3_DAYS": "تا 3 روز گذشته",
+		"SINCE_7_DAYS": "تا 1 هفته گذشته",
+		"SINCE_MONTH": "تا 1 ماه گذشته",
+		"SINCE_3_MONTHS": "تا 3 ماه گذشته",
+		"SINCE_6_MONTHS": "تا 6 ماه گذشته",
+		"SINCE_YEAR": "تا 1 سال گذشته",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/fi/user.json b/snappymail/v/0.0.0/app/localization/fi/user.json
index 06379e0e2..16099cca8 100644
--- a/snappymail/v/0.0.0/app/localization/fi/user.json
+++ b/snappymail/v/0.0.0/app/localization/fi/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Ei luettu",
 		"DATE": "Pvm",
 		"DATE_ALL": "Kaikki",
-		"DATE_3_DAYS": "3 päivän ajalta",
-		"DATE_7_DAYS": "1 viikon ajalta",
-		"DATE_MONTH": "1 kk ajalta",
-		"DATE_3_MONTHS": "3 kk ajalta",
-		"DATE_6_MONTHS": "6 kk ajalta",
-		"DATE_YEAR": "1 vuoden ajalta",
+		"SINCE_3_DAYS": "3 päivän ajalta",
+		"SINCE_7_DAYS": "1 viikon ajalta",
+		"SINCE_MONTH": "1 kk ajalta",
+		"SINCE_3_MONTHS": "3 kk ajalta",
+		"SINCE_6_MONTHS": "6 kk ajalta",
+		"SINCE_YEAR": "1 vuoden ajalta",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/fr/user.json b/snappymail/v/0.0.0/app/localization/fr/user.json
index eabca47b5..0fb96e800 100644
--- a/snappymail/v/0.0.0/app/localization/fr/user.json
+++ b/snappymail/v/0.0.0/app/localization/fr/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Non lu",
 		"DATE": "Date",
 		"DATE_ALL": "Tous",
-		"DATE_3_DAYS": "Jusqu'à 3 jours",
-		"DATE_7_DAYS": "Jusqu'à 1 semaine",
-		"DATE_MONTH": "Jusqu'à 1 mois",
-		"DATE_3_MONTHS": "Jusqu'à 3 mois",
-		"DATE_6_MONTHS": "Jusqu'à 6 mois",
-		"DATE_YEAR": "Jusqu'à 1 an",
+		"SINCE_3_DAYS": "Jusqu'à 3 jours",
+		"SINCE_7_DAYS": "Jusqu'à 1 semaine",
+		"SINCE_MONTH": "Jusqu'à 1 mois",
+		"SINCE_3_MONTHS": "Jusqu'à 3 mois",
+		"SINCE_6_MONTHS": "Jusqu'à 6 mois",
+		"SINCE_YEAR": "Jusqu'à 1 an",
 		"SUBFOLDERS": "Sous-dossiers",
 		"SUBFOLDERS_NONE": "Aucun",
 		"SUBFOLDERS_SUBTREE": "Tous",
diff --git a/snappymail/v/0.0.0/app/localization/hu/user.json b/snappymail/v/0.0.0/app/localization/hu/user.json
index 21626341e..586dc6787 100644
--- a/snappymail/v/0.0.0/app/localization/hu/user.json
+++ b/snappymail/v/0.0.0/app/localization/hu/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Észrevétlen",
 		"DATE": "Dátum",
 		"DATE_ALL": "Összes",
-		"DATE_3_DAYS": "Legfeljebb 3 napos",
-		"DATE_7_DAYS": "Legfeljebb 1 hetes",
-		"DATE_MONTH": "Legfeljebb 1 hónapos",
-		"DATE_3_MONTHS": "Legfeljebb 3 hónapos",
-		"DATE_6_MONTHS": "Legfeljebb 6 hónapos",
-		"DATE_YEAR": "Legfeljebb 1 éves",
+		"SINCE_3_DAYS": "Legfeljebb 3 napos",
+		"SINCE_7_DAYS": "Legfeljebb 1 hetes",
+		"SINCE_MONTH": "Legfeljebb 1 hónapos",
+		"SINCE_3_MONTHS": "Legfeljebb 3 hónapos",
+		"SINCE_6_MONTHS": "Legfeljebb 6 hónapos",
+		"SINCE_YEAR": "Legfeljebb 1 éves",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/id/user.json b/snappymail/v/0.0.0/app/localization/id/user.json
index da618f718..8508c9c14 100644
--- a/snappymail/v/0.0.0/app/localization/id/user.json
+++ b/snappymail/v/0.0.0/app/localization/id/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Belum dilihat",
 		"DATE": "Tanggal",
 		"DATE_ALL": "Semua",
-		"DATE_3_DAYS": "Sudah 3 hari lalu",
-		"DATE_7_DAYS": "Sudah 1 bulan lalu",
-		"DATE_MONTH": "Lebih dari 1 bulan lalu",
-		"DATE_3_MONTHS": "Lebih dari 3 bulan lalu",
-		"DATE_6_MONTHS": "Lebih dari 6 bulan lalu",
-		"DATE_YEAR": "Lebih dari 1 tahun lalu",
+		"SINCE_3_DAYS": "Sudah 3 hari lalu",
+		"SINCE_7_DAYS": "Sudah 1 bulan lalu",
+		"SINCE_MONTH": "Lebih dari 1 bulan lalu",
+		"SINCE_3_MONTHS": "Lebih dari 3 bulan lalu",
+		"SINCE_6_MONTHS": "Lebih dari 6 bulan lalu",
+		"SINCE_YEAR": "Lebih dari 1 tahun lalu",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/is/user.json b/snappymail/v/0.0.0/app/localization/is/user.json
index 89002e52a..df3dbd34d 100644
--- a/snappymail/v/0.0.0/app/localization/is/user.json
+++ b/snappymail/v/0.0.0/app/localization/is/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Ólesið",
 		"DATE": "Dagsetning",
 		"DATE_ALL": "Allt",
-		"DATE_3_DAYS": "Allt að 3 daga gömlu",
-		"DATE_7_DAYS": "Allt að viku gömlu",
-		"DATE_MONTH": "Allt að mánaðar gömlu",
-		"DATE_3_MONTHS": "Allt að 3 mánaða gömlu",
-		"DATE_6_MONTHS": "Allt að 6 mánaða gömlu",
-		"DATE_YEAR": "Allt að 1 árs gömlu",
+		"SINCE_3_DAYS": "Allt að 3 daga gömlu",
+		"SINCE_7_DAYS": "Allt að viku gömlu",
+		"SINCE_MONTH": "Allt að mánaðar gömlu",
+		"SINCE_3_MONTHS": "Allt að 3 mánaða gömlu",
+		"SINCE_6_MONTHS": "Allt að 6 mánaða gömlu",
+		"SINCE_YEAR": "Allt að 1 árs gömlu",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/it/user.json b/snappymail/v/0.0.0/app/localization/it/user.json
index 74bc2cc1d..e347932da 100644
--- a/snappymail/v/0.0.0/app/localization/it/user.json
+++ b/snappymail/v/0.0.0/app/localization/it/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Non letti",
 		"DATE": "Data",
 		"DATE_ALL": "Tutte",
-		"DATE_3_DAYS": "Meno di 3 giorni fa",
-		"DATE_7_DAYS": "Meno di una settimana fa",
-		"DATE_MONTH": "Meno di un mese fa",
-		"DATE_3_MONTHS": "Meno di 3 mesi fa",
-		"DATE_6_MONTHS": "Meno di 6 mesi fa",
-		"DATE_YEAR": "Meno di un anno fa",
+		"SINCE_3_DAYS": "Meno di 3 giorni fa",
+		"SINCE_7_DAYS": "Meno di una settimana fa",
+		"SINCE_MONTH": "Meno di un mese fa",
+		"SINCE_3_MONTHS": "Meno di 3 mesi fa",
+		"SINCE_6_MONTHS": "Meno di 6 mesi fa",
+		"SINCE_YEAR": "Meno di un anno fa",
 		"SUBFOLDERS": "Sottocartelle",
 		"SUBFOLDERS_NONE": "Nessuna",
 		"SUBFOLDERS_SUBTREE": "Tutte",
diff --git a/snappymail/v/0.0.0/app/localization/ja/user.json b/snappymail/v/0.0.0/app/localization/ja/user.json
index 0d704b7cc..45a42f50f 100644
--- a/snappymail/v/0.0.0/app/localization/ja/user.json
+++ b/snappymail/v/0.0.0/app/localization/ja/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "未読メール",
 		"DATE": "日付",
 		"DATE_ALL": "全て",
-		"DATE_3_DAYS": "3日前まで",
-		"DATE_7_DAYS": "1週間前まで",
-		"DATE_MONTH": "1ヶ月前まで",
-		"DATE_3_MONTHS": "3ヶ月前まで",
-		"DATE_6_MONTHS": "6ヶ月前まで",
-		"DATE_YEAR": "1年前まで",
+		"SINCE_3_DAYS": "3日前まで",
+		"SINCE_7_DAYS": "1週間前まで",
+		"SINCE_MONTH": "1ヶ月前まで",
+		"SINCE_3_MONTHS": "3ヶ月前まで",
+		"SINCE_6_MONTHS": "6ヶ月前まで",
+		"SINCE_YEAR": "1年前まで",
 		"SUBFOLDERS": "サブフォルダ",
 		"SUBFOLDERS_NONE": "なし",
 		"SUBFOLDERS_SUBTREE": "全て",
diff --git a/snappymail/v/0.0.0/app/localization/ko/user.json b/snappymail/v/0.0.0/app/localization/ko/user.json
index 80321277e..fc2f4c729 100644
--- a/snappymail/v/0.0.0/app/localization/ko/user.json
+++ b/snappymail/v/0.0.0/app/localization/ko/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "읽지 않음",
 		"DATE": "날짜",
 		"DATE_ALL": "모두",
-		"DATE_3_DAYS": "3일 이내",
-		"DATE_7_DAYS": "1주일 이내",
-		"DATE_MONTH": "1개월 이내",
-		"DATE_3_MONTHS": "3개월 이내",
-		"DATE_6_MONTHS": "6개월 이내",
-		"DATE_YEAR": "1년 이내",
+		"SINCE_3_DAYS": "3일 이내",
+		"SINCE_7_DAYS": "1주일 이내",
+		"SINCE_MONTH": "1개월 이내",
+		"SINCE_3_MONTHS": "3개월 이내",
+		"SINCE_6_MONTHS": "6개월 이내",
+		"SINCE_YEAR": "1년 이내",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/lt/user.json b/snappymail/v/0.0.0/app/localization/lt/user.json
index 3ac12effb..32c8bc3d7 100644
--- a/snappymail/v/0.0.0/app/localization/lt/user.json
+++ b/snappymail/v/0.0.0/app/localization/lt/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Neskaitytas",
 		"DATE": "Data",
 		"DATE_ALL": "Visi",
-		"DATE_3_DAYS": "Nesenesni kaip 3 dienų",
-		"DATE_7_DAYS": "Nesenesni kaip 1 savaitės",
-		"DATE_MONTH": "Nesenesni kaip 1 mėnesio",
-		"DATE_3_MONTHS": "Nesenesni kaip 3 mėnesių",
-		"DATE_6_MONTHS": "Nesenesni kaip 6 mėnesių",
-		"DATE_YEAR": "Nesenesni kaip 1 metų",
+		"SINCE_3_DAYS": "Nesenesni kaip 3 dienų",
+		"SINCE_7_DAYS": "Nesenesni kaip 1 savaitės",
+		"SINCE_MONTH": "Nesenesni kaip 1 mėnesio",
+		"SINCE_3_MONTHS": "Nesenesni kaip 3 mėnesių",
+		"SINCE_6_MONTHS": "Nesenesni kaip 6 mėnesių",
+		"SINCE_YEAR": "Nesenesni kaip 1 metų",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/lv/user.json b/snappymail/v/0.0.0/app/localization/lv/user.json
index e1de0ada0..5d7fd9630 100644
--- a/snappymail/v/0.0.0/app/localization/lv/user.json
+++ b/snappymail/v/0.0.0/app/localization/lv/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Unseen",
 		"DATE": "Datums",
 		"DATE_ALL": "Viss periods",
-		"DATE_3_DAYS": "Līdz 3 dienas vecs",
-		"DATE_7_DAYS": "Līdz 1 nedēļu vecs",
-		"DATE_MONTH": "Līdz 1 mēnesi vecs",
-		"DATE_3_MONTHS": "Līdz 3 mēnešus vecs",
-		"DATE_6_MONTHS": "Līdz 6 mēnešus vecs",
-		"DATE_YEAR": "Līdz 1 gadu vecs",
+		"SINCE_3_DAYS": "Līdz 3 dienas vecs",
+		"SINCE_7_DAYS": "Līdz 1 nedēļu vecs",
+		"SINCE_MONTH": "Līdz 1 mēnesi vecs",
+		"SINCE_3_MONTHS": "Līdz 3 mēnešus vecs",
+		"SINCE_6_MONTHS": "Līdz 6 mēnešus vecs",
+		"SINCE_YEAR": "Līdz 1 gadu vecs",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/nb/user.json b/snappymail/v/0.0.0/app/localization/nb/user.json
index ddc3e66a3..034672637 100644
--- a/snappymail/v/0.0.0/app/localization/nb/user.json
+++ b/snappymail/v/0.0.0/app/localization/nb/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Ulest",
 		"DATE": "Dato",
 		"DATE_ALL": "Alle",
-		"DATE_3_DAYS": "Inntil 3 dager gamle",
-		"DATE_7_DAYS": "Inntil 1 uke gamle",
-		"DATE_MONTH": "Inntil 1 måned gamle",
-		"DATE_3_MONTHS": "Inntil 3 måneder gamle",
-		"DATE_6_MONTHS": "Inntil 6 måneder gamle",
-		"DATE_YEAR": "Inntil 1 år gamle",
+		"SINCE_3_DAYS": "Inntil 3 dager gamle",
+		"SINCE_7_DAYS": "Inntil 1 uke gamle",
+		"SINCE_MONTH": "Inntil 1 måned gamle",
+		"SINCE_3_MONTHS": "Inntil 3 måneder gamle",
+		"SINCE_6_MONTHS": "Inntil 6 måneder gamle",
+		"SINCE_YEAR": "Inntil 1 år gamle",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "Alle",
diff --git a/snappymail/v/0.0.0/app/localization/nl/user.json b/snappymail/v/0.0.0/app/localization/nl/user.json
index 881364adb..431db9742 100644
--- a/snappymail/v/0.0.0/app/localization/nl/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Ongelezen",
 		"DATE": "Datum",
 		"DATE_ALL": "Alles",
-		"DATE_3_DAYS": "Tot 3 dagen oud",
-		"DATE_7_DAYS": "Tot 1 week oud",
-		"DATE_MONTH": "Tot 1 maand oud",
-		"DATE_3_MONTHS": "Tot 3 maanden oud",
-		"DATE_6_MONTHS": "Tot 6 maanden oud",
-		"DATE_YEAR": "Tot 1 jaar oud",
+		"SINCE_3_DAYS": "Tot 3 dagen oud",
+		"SINCE_7_DAYS": "Tot 1 week oud",
+		"SINCE_MONTH": "Tot 1 maand oud",
+		"SINCE_3_MONTHS": "Tot 3 maanden oud",
+		"SINCE_6_MONTHS": "Tot 6 maanden oud",
+		"SINCE_YEAR": "Tot 1 jaar oud",
 		"SUBFOLDERS": "Submappen",
 		"SUBFOLDERS_NONE": "Geen",
 		"SUBFOLDERS_SUBTREE": "Alle",
diff --git a/snappymail/v/0.0.0/app/localization/pl/user.json b/snappymail/v/0.0.0/app/localization/pl/user.json
index 0861b539e..3a1f735fe 100644
--- a/snappymail/v/0.0.0/app/localization/pl/user.json
+++ b/snappymail/v/0.0.0/app/localization/pl/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Nieprzeczytana",
 		"DATE": "Data",
 		"DATE_ALL": "Wszystkie",
-		"DATE_3_DAYS": "do 3 dni",
-		"DATE_7_DAYS": "do tygodnia",
-		"DATE_MONTH": "do miesiąca",
-		"DATE_3_MONTHS": "do 3 miesięcy",
-		"DATE_6_MONTHS": "do 6 miesięcy",
-		"DATE_YEAR": "do roku",
+		"SINCE_3_DAYS": "do 3 dni",
+		"SINCE_7_DAYS": "do tygodnia",
+		"SINCE_MONTH": "do miesiąca",
+		"SINCE_3_MONTHS": "do 3 miesięcy",
+		"SINCE_6_MONTHS": "do 6 miesięcy",
+		"SINCE_YEAR": "do roku",
 		"SUBFOLDERS": "Podfoldery",
 		"SUBFOLDERS_NONE": "Brak",
 		"SUBFOLDERS_SUBTREE": "Wszystkie",
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/user.json b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
index a515fa29e..a10a0c98a 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Não Lida",
 		"DATE": "Data",
 		"DATE_ALL": "Qualquer",
-		"DATE_3_DAYS": "Até 3 dias atrás",
-		"DATE_7_DAYS": "Até 1 semana atrás",
-		"DATE_MONTH": "Até 1 mês atrás",
-		"DATE_3_MONTHS": "Até 3 meses atrás",
-		"DATE_6_MONTHS": "Até 6 meses atrás",
-		"DATE_YEAR": "Até 1 ano atrás",
+		"SINCE_3_DAYS": "Até 3 dias atrás",
+		"SINCE_7_DAYS": "Até 1 semana atrás",
+		"SINCE_MONTH": "Até 1 mês atrás",
+		"SINCE_3_MONTHS": "Até 3 meses atrás",
+		"SINCE_6_MONTHS": "Até 6 meses atrás",
+		"SINCE_YEAR": "Até 1 ano atrás",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/pt/user.json b/snappymail/v/0.0.0/app/localization/pt/user.json
index 6128107b2..2f2171e0f 100644
--- a/snappymail/v/0.0.0/app/localization/pt/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Não lida",
 		"DATE": "Data",
 		"DATE_ALL": "Qualquer",
-		"DATE_3_DAYS": "Até 3 dias atrás",
-		"DATE_7_DAYS": "Até 1 semana atrás",
-		"DATE_MONTH": "Até 1 mês atrás",
-		"DATE_3_MONTHS": "Até 3 meses atrás",
-		"DATE_6_MONTHS": "Até 6 meses atrás",
-		"DATE_YEAR": "Até 1 ano atrás",
+		"SINCE_3_DAYS": "Até 3 dias atrás",
+		"SINCE_7_DAYS": "Até 1 semana atrás",
+		"SINCE_MONTH": "Até 1 mês atrás",
+		"SINCE_3_MONTHS": "Até 3 meses atrás",
+		"SINCE_6_MONTHS": "Até 6 meses atrás",
+		"SINCE_YEAR": "Até 1 ano atrás",
 		"SUBFOLDERS": "Subpastas",
 		"SUBFOLDERS_NONE": "Nenhuma",
 		"SUBFOLDERS_SUBTREE": "Todas",
diff --git a/snappymail/v/0.0.0/app/localization/ro/user.json b/snappymail/v/0.0.0/app/localization/ro/user.json
index 06ea5c270..f2f00482b 100644
--- a/snappymail/v/0.0.0/app/localization/ro/user.json
+++ b/snappymail/v/0.0.0/app/localization/ro/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Necitit",
 		"DATE": "Data",
 		"DATE_ALL": "Tot timpul",
-		"DATE_3_DAYS": "З zile",
-		"DATE_7_DAYS": "7 zile",
-		"DATE_MONTH": "în această lună",
-		"DATE_3_MONTHS": "3 luni",
-		"DATE_6_MONTHS": "6 luni",
-		"DATE_YEAR": "în acest an",
+		"SINCE_3_DAYS": "З zile",
+		"SINCE_7_DAYS": "7 zile",
+		"SINCE_MONTH": "în această lună",
+		"SINCE_3_MONTHS": "3 luni",
+		"SINCE_6_MONTHS": "6 luni",
+		"SINCE_YEAR": "în acest an",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/ru/user.json b/snappymail/v/0.0.0/app/localization/ru/user.json
index 336adf81c..c5a66fe4f 100644
--- a/snappymail/v/0.0.0/app/localization/ru/user.json
+++ b/snappymail/v/0.0.0/app/localization/ru/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Непрочитанные",
 		"DATE": "Дата",
 		"DATE_ALL": "За всё время",
-		"DATE_3_DAYS": "За три дня",
-		"DATE_7_DAYS": "За неделю",
-		"DATE_MONTH": "За месяц",
-		"DATE_3_MONTHS": "За 3 месяца",
-		"DATE_6_MONTHS": "За полгода",
-		"DATE_YEAR": "За год",
+		"SINCE_3_DAYS": "За три дня",
+		"SINCE_7_DAYS": "За неделю",
+		"SINCE_MONTH": "За месяц",
+		"SINCE_3_MONTHS": "За 3 месяца",
+		"SINCE_6_MONTHS": "За полгода",
+		"SINCE_YEAR": "За год",
 		"SUBFOLDERS": "Подпапки",
 		"SUBFOLDERS_NONE": "Ничего",
 		"SUBFOLDERS_SUBTREE": "Все",
diff --git a/snappymail/v/0.0.0/app/localization/sk/user.json b/snappymail/v/0.0.0/app/localization/sk/user.json
index 8548d3a65..ba621519c 100644
--- a/snappymail/v/0.0.0/app/localization/sk/user.json
+++ b/snappymail/v/0.0.0/app/localization/sk/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Neprečítané",
 		"DATE": "Dátum",
 		"DATE_ALL": "Kedykoľvek",
-		"DATE_3_DAYS": "Nie staršie ako 3 dni",
-		"DATE_7_DAYS": "Nie staršie ako týždeň",
-		"DATE_MONTH": "Nie staršie ako mesiac",
-		"DATE_3_MONTHS": "Nie staršie ako 3 mesiace",
-		"DATE_6_MONTHS": "Nie staršie ako 6 mesiacov",
-		"DATE_YEAR": "Nie staršie ako 1 rok",
+		"SINCE_3_DAYS": "Nie staršie ako 3 dni",
+		"SINCE_7_DAYS": "Nie staršie ako týždeň",
+		"SINCE_MONTH": "Nie staršie ako mesiac",
+		"SINCE_3_MONTHS": "Nie staršie ako 3 mesiace",
+		"SINCE_6_MONTHS": "Nie staršie ako 6 mesiacov",
+		"SINCE_YEAR": "Nie staršie ako 1 rok",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/sl/user.json b/snappymail/v/0.0.0/app/localization/sl/user.json
index 5b615913f..96ea1d392 100644
--- a/snappymail/v/0.0.0/app/localization/sl/user.json
+++ b/snappymail/v/0.0.0/app/localization/sl/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Neprebrano",
 		"DATE": "Datum",
 		"DATE_ALL": "Vsa",
-		"DATE_3_DAYS": "Do 3 dni nazaj",
-		"DATE_7_DAYS": "Do 1 tedna nazaj",
-		"DATE_MONTH": "Do 1  meseca nazaj",
-		"DATE_3_MONTHS": "Do 3 mesecev nazaj",
-		"DATE_6_MONTHS": "Do 6 mesecev nazaj",
-		"DATE_YEAR": "Do 1 leta nazaj",
+		"SINCE_3_DAYS": "Do 3 dni nazaj",
+		"SINCE_7_DAYS": "Do 1 tedna nazaj",
+		"SINCE_MONTH": "Do 1  meseca nazaj",
+		"SINCE_3_MONTHS": "Do 3 mesecev nazaj",
+		"SINCE_6_MONTHS": "Do 6 mesecev nazaj",
+		"SINCE_YEAR": "Do 1 leta nazaj",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/sv/user.json b/snappymail/v/0.0.0/app/localization/sv/user.json
index e17770704..46ec9d835 100644
--- a/snappymail/v/0.0.0/app/localization/sv/user.json
+++ b/snappymail/v/0.0.0/app/localization/sv/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Oläst",
 		"DATE": "Datum",
 		"DATE_ALL": "Alla",
-		"DATE_3_DAYS": "Upp till 3 dagar gammalt",
-		"DATE_7_DAYS": "Upp till 1 vecka gammalt",
-		"DATE_MONTH": "Upp till 1 månad gammalt",
-		"DATE_3_MONTHS": "Upp till 3 månader gammalt",
-		"DATE_6_MONTHS": "Upp till 6 månader gammalt",
-		"DATE_YEAR": "Upp till 1 år gammalt",
+		"SINCE_3_DAYS": "Upp till 3 dagar gammalt",
+		"SINCE_7_DAYS": "Upp till 1 vecka gammalt",
+		"SINCE_MONTH": "Upp till 1 månad gammalt",
+		"SINCE_3_MONTHS": "Upp till 3 månader gammalt",
+		"SINCE_6_MONTHS": "Upp till 6 månader gammalt",
+		"SINCE_YEAR": "Upp till 1 år gammalt",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/tr/user.json b/snappymail/v/0.0.0/app/localization/tr/user.json
index 370395e3e..e0d82a89f 100644
--- a/snappymail/v/0.0.0/app/localization/tr/user.json
+++ b/snappymail/v/0.0.0/app/localization/tr/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Görünmeyen",
 		"DATE": "Tarih",
 		"DATE_ALL": "Hepsi",
-		"DATE_3_DAYS": "3 gün önceki",
-		"DATE_7_DAYS": "1 hafta önceki",
-		"DATE_MONTH": "1 ay önceki",
-		"DATE_3_MONTHS": "3 ay önceki",
-		"DATE_6_MONTHS": "6 ay önceki",
-		"DATE_YEAR": "1 yıl önceki",
+		"SINCE_3_DAYS": "3 gün önceki",
+		"SINCE_7_DAYS": "1 hafta önceki",
+		"SINCE_MONTH": "1 ay önceki",
+		"SINCE_3_MONTHS": "3 ay önceki",
+		"SINCE_6_MONTHS": "6 ay önceki",
+		"SINCE_YEAR": "1 yıl önceki",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/uk/user.json b/snappymail/v/0.0.0/app/localization/uk/user.json
index b3ce8322b..9be654fe5 100644
--- a/snappymail/v/0.0.0/app/localization/uk/user.json
+++ b/snappymail/v/0.0.0/app/localization/uk/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Непрочитані",
 		"DATE": "Дата",
 		"DATE_ALL": "За весь час",
-		"DATE_3_DAYS": "За три дні",
-		"DATE_7_DAYS": "За тиждень",
-		"DATE_MONTH": "За місяць",
-		"DATE_3_MONTHS": "За 3 місяці",
-		"DATE_6_MONTHS": "За півроку",
-		"DATE_YEAR": "За рік",
+		"SINCE_3_DAYS": "За три дні",
+		"SINCE_7_DAYS": "За тиждень",
+		"SINCE_MONTH": "За місяць",
+		"SINCE_3_MONTHS": "За 3 місяці",
+		"SINCE_6_MONTHS": "За півроку",
+		"SINCE_YEAR": "За рік",
 		"SUBFOLDERS": "Subfolders",
 		"SUBFOLDERS_NONE": "None",
 		"SUBFOLDERS_SUBTREE": "All",
diff --git a/snappymail/v/0.0.0/app/localization/vi/user.json b/snappymail/v/0.0.0/app/localization/vi/user.json
index 26cf5fcd3..c60a786c0 100644
--- a/snappymail/v/0.0.0/app/localization/vi/user.json
+++ b/snappymail/v/0.0.0/app/localization/vi/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "Chưa được xem",
 		"DATE": "Ngày",
 		"DATE_ALL": "Tất cả",
-		"DATE_3_DAYS": "Khoảng 3 ngày trước",
-		"DATE_7_DAYS": "Khoảng 1 tuần trước",
-		"DATE_MONTH": "Khoảng 1 tháng trước",
-		"DATE_3_MONTHS": "Khoảng 3 tháng trước",
-		"DATE_6_MONTHS": "Khoảng 6 tháng trước",
-		"DATE_YEAR": "Khoảng 1 năm trước",
+		"SINCE_3_DAYS": "Khoảng 3 ngày trước",
+		"SINCE_7_DAYS": "Khoảng 1 tuần trước",
+		"SINCE_MONTH": "Khoảng 1 tháng trước",
+		"SINCE_3_MONTHS": "Khoảng 3 tháng trước",
+		"SINCE_6_MONTHS": "Khoảng 6 tháng trước",
+		"SINCE_YEAR": "Khoảng 1 năm trước",
 		"SUBFOLDERS": "Thư mục con",
 		"SUBFOLDERS_NONE": "Trống",
 		"SUBFOLDERS_SUBTREE": "Tất cả",
diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/user.json b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
index 8e5a91fa6..456dd54bf 100644
--- a/snappymail/v/0.0.0/app/localization/zh-TW/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "未讀取",
 		"DATE": "日期",
 		"DATE_ALL": "全部",
-		"DATE_3_DAYS": "三天以內",
-		"DATE_7_DAYS": "一週以內",
-		"DATE_MONTH": "一個月以內",
-		"DATE_3_MONTHS": "三個月以內",
-		"DATE_6_MONTHS": "半年以內",
-		"DATE_YEAR": "一年以內",
+		"SINCE_3_DAYS": "三天以內",
+		"SINCE_7_DAYS": "一週以內",
+		"SINCE_MONTH": "一個月以內",
+		"SINCE_3_MONTHS": "三個月以內",
+		"SINCE_6_MONTHS": "半年以內",
+		"SINCE_YEAR": "一年以內",
 		"SUBFOLDERS": "子資料夾",
 		"SUBFOLDERS_NONE": "無",
 		"SUBFOLDERS_SUBTREE": "全部",
diff --git a/snappymail/v/0.0.0/app/localization/zh/user.json b/snappymail/v/0.0.0/app/localization/zh/user.json
index ff62057ca..7671f756b 100644
--- a/snappymail/v/0.0.0/app/localization/zh/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh/user.json
@@ -59,12 +59,12 @@
 		"UNSEEN": "不可见",
 		"DATE": "日期",
 		"DATE_ALL": "所有邮件",
-		"DATE_3_DAYS": "3天以内",
-		"DATE_7_DAYS": "1周以内",
-		"DATE_MONTH": "1个月以内",
-		"DATE_3_MONTHS": "3个月以内",
-		"DATE_6_MONTHS": "半年以内",
-		"DATE_YEAR": "1年以内",
+		"SINCE_3_DAYS": "3天以内",
+		"SINCE_7_DAYS": "1周以内",
+		"SINCE_MONTH": "1个月以内",
+		"SINCE_3_MONTHS": "3个月以内",
+		"SINCE_6_MONTHS": "半年以内",
+		"SINCE_YEAR": "1年以内",
 		"SUBFOLDERS": "子文件夹",
 		"SUBFOLDERS_NONE": "无",
 		"SUBFOLDERS_SUBTREE": "全部",