diff --git a/CHANGELOG b/CHANGELOG
index c8cb6b560..7f2044a64 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ CHANGELOG Roundcube Webmail
 - Relaxed domain name validation for extended TLDs support (#5588)
 - Added support for INSERT OR REPLACE queries (#6771)
 - Extract RFC2231 attachment name from message headers (#6729, #6783)
+- Archive: Added options to split archive by year or year+month and folder (#7216)
 - Managesieve: Allow display name with email address in vacation :from field (#6760)
 - Password: Added 'pwned' password strength driver (#7274)
 - Add support for SameSite cookie attribute via session_samesite option (req PHP >= 7.3.0) (#6772)
diff --git a/plugins/archive/composer.json b/plugins/archive/composer.json
index ca53d9e4f..9ad921bbc 100644
--- a/plugins/archive/composer.json
+++ b/plugins/archive/composer.json
@@ -3,7 +3,7 @@
     "type": "roundcube-plugin",
     "description": "This adds a button to move the selected messages to an archive folder. The folder (and the optional structure of subfolders) can be selected in the settings panel.",
     "license": "GPLv3+",
-    "version": "3.4",
+    "version": "3.5",
     "authors": [
         {
             "name": "Thomas Bruederli",
diff --git a/plugins/archive/localization/en_CA.inc b/plugins/archive/localization/en_CA.inc
index 5a083d797..3b1bbb045 100644
--- a/plugins/archive/localization/en_CA.inc
+++ b/plugins/archive/localization/en_CA.inc
@@ -24,8 +24,8 @@ $labels['settingstitle'] = 'Archive';
 $labels['archivetype'] = 'Divide archive by';
 $labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
 $labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolderyear'] = 'Year then original folder (e.g. Archives/...)';
-$labels['archivetypefoldermonth'] = 'Month then original folder (e.g. Archives/2012/...)';
+$labels['archivetypefolderyear'] = 'Year then original folder (e.g. Archive/...)';
+$labels['archivetypefoldermonth'] = 'Month then original folder (e.g. Archive/2012/...)';
 $labels['archivetypefolder'] = 'Original folder';
 $labels['archivetypesender'] = 'Sender email';
 $labels['unkownsender'] = 'unknown';
diff --git a/plugins/archive/localization/en_GB.inc b/plugins/archive/localization/en_GB.inc
index 32d6de70a..92e82d052 100644
--- a/plugins/archive/localization/en_GB.inc
+++ b/plugins/archive/localization/en_GB.inc
@@ -26,8 +26,8 @@ $labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
 $labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
 $labels['archivetypetbmonth'] = 'Month - Thunderbird compatible (e.g. Archive/2012/2012-06)';
 $labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypefolderyear'] = 'Year then original folder (e.g. Archives/...)';
-$labels['archivetypefoldermonth'] = 'Month then original folder (e.g. Archives/2012/...)';
+$labels['archivetypefolderyear'] = 'Year then original folder (e.g. Archive/...)';
+$labels['archivetypefoldermonth'] = 'Month then original folder (e.g. Archive/2012/...)';
 $labels['archivetypesender'] = 'Sender email';
 $labels['unkownsender'] = 'unknown';
 $labels['readonarchive'] = 'Mark the message as read on archive';
diff --git a/plugins/archive/localization/en_US.inc b/plugins/archive/localization/en_US.inc
index 0334f814d..f1702d9b6 100644
--- a/plugins/archive/localization/en_US.inc
+++ b/plugins/archive/localization/en_US.inc
@@ -27,10 +27,8 @@ $labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
 $labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
 $labels['archivetypetbmonth'] = 'Month - Thunderbird compatible (e.g. Archive/2012/2012-06)';
 $labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypefolderyear'] = 'Year then original folder (e.g. Archives/...)';
-$labels['archivetypefoldermonth'] = 'Month then original folder (e.g. Archives/2012/...)';
+$labels['archivetypefolderyear'] = 'Year then original folder (e.g. Archive/...)';
+$labels['archivetypefoldermonth'] = 'Month then original folder (e.g. Archive/2012/...)';
 $labels['archivetypesender'] = 'Sender email';
 $labels['unkownsender'] = 'unknown';
 $labels['readonarchive'] = 'Mark the message as read on archive';
-
-?>
diff --git a/plugins/archive/localization/fr_FR.inc b/plugins/archive/localization/fr_FR.inc
index c10af78a6..46a789600 100644
--- a/plugins/archive/localization/fr_FR.inc
+++ b/plugins/archive/localization/fr_FR.inc
@@ -26,9 +26,8 @@ $labels['archivetypeyear'] = 'Année (p. ex. Archives/2012)';
 $labels['archivetypemonth'] = 'Mois (p. ex. Archives/2012/06)';
 $labels['archivetypetbmonth'] = 'Mois – compatible avec Thunderbird (p.ex. Archive/2012/2012-06)';
 $labels['archivetypefolder'] = 'Dossier original';
-$labels['archivetypefolderyear'] = 'Année puis dossier original (p. ex. Archives/...)';
-$labels['archivetypefoldermonth'] = 'Mois puis dossier original (p. ex. Archives/2012/...)';
+$labels['archivetypefolderyear'] = 'Année puis dossier original (p. ex. Archive/...)';
+$labels['archivetypefoldermonth'] = 'Mois puis dossier original (p. ex. Archive/2012/...)';
 $labels['archivetypesender'] = 'Courriel de l’expéditeur';
 $labels['unkownsender'] = 'inconnu';
 $labels['readonarchive'] = 'Marquer le courriel comme lu lors de l’archivage';
-?>