diff --git a/CHANGELOG b/CHANGELOG
index 20a7a5076..ad51aa2c5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Archive: Add Thunderbird compatible Month option (#5623)
 - Return "401 Unauthorized" status when login fails (#5663)
 - Support both comma and semicolon as recipient separator, drop recipients_separator option (#5092)
 - Plugin API: Added 'show_bytes' hook (#5001)
diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php
index fc9432f43..ea60371a9 100644
--- a/plugins/archive/archive.php
+++ b/plugins/archive/archive.php
@@ -6,7 +6,7 @@
  * Plugin that adds a new button to the mailbox toolbar
  * to move messages to a (user selectable) archive folder.
  *
- * @version 3.0
+ * @version 3.1
  * @license GNU GPLv3+
  * @author Andre Rodier, Thomas Bruederli, Aleksander Machniak
  */
@@ -188,7 +188,7 @@ class archive extends rcube_plugin
                             . $delimiter . $rcmail->format_date($message->timestamp, 'm');
                         break;
 
-                    case 'thunderbirdmonth':
+                    case 'tbmonth':
                         $subfolder = $rcmail->format_date($message->timestamp, 'Y')
                             . $delimiter . $rcmail->format_date($message->timestamp, 'Y')
                             . '-' . $rcmail->format_date($message->timestamp, 'm');
@@ -416,7 +416,7 @@ class archive extends rcube_plugin
             $archive_type->add($this->gettext('none'), '');
             $archive_type->add($this->gettext('archivetypeyear'), 'year');
             $archive_type->add($this->gettext('archivetypemonth'), 'month');
-            $archive_type->add($this->gettext('archivetypethunderbirdmonth'), 'thunderbirdmonth');
+            $archive_type->add($this->gettext('archivetypetbmonth'), 'tbmonth');
             $archive_type->add($this->gettext('archivetypesender'), 'sender');
             $archive_type->add($this->gettext('archivetypefolder'), 'folder');
 
diff --git a/plugins/archive/composer.json b/plugins/archive/composer.json
index b223d2eaa..10004089c 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.0",
+    "version": "3.1",
     "authors": [
         {
             "name": "Thomas Bruederli",
diff --git a/plugins/archive/localization/en_CA.inc b/plugins/archive/localization/en_CA.inc
index 15dba5f03..533b09b7a 100644
--- a/plugins/archive/localization/en_CA.inc
+++ b/plugins/archive/localization/en_CA.inc
@@ -25,7 +25,7 @@ $labels['settingstitle'] = 'Archive';
 $labels['archivetype'] = 'Divide archive by';
 $labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
 $labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypethunderbirdmonth'] = 'Month - Thunderbird compatible (e.g. Archive/2012/2012-06)';
+$labels['archivetypetbmonth'] = 'Month - Thunderbird compatible (e.g. Archive/2012/2012-06)';
 $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 3661da4be..ef563d77c 100644
--- a/plugins/archive/localization/en_GB.inc
+++ b/plugins/archive/localization/en_GB.inc
@@ -25,7 +25,7 @@ $labels['settingstitle'] = 'Archive';
 $labels['archivetype'] = 'Divide archive by';
 $labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
 $labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypethunderbirdmonth'] = 'Month - Thunderbird compatible (e.g. Archive/2012/2012-06)';
+$labels['archivetypetbmonth'] = 'Month - Thunderbird compatible (e.g. Archive/2012/2012-06)';
 $labels['archivetypefolder'] = 'Original folder';
 $labels['archivetypesender'] = 'Sender email';
 $labels['unkownsender'] = 'unknown';
diff --git a/plugins/archive/localization/en_US.inc b/plugins/archive/localization/en_US.inc
index eadcc4956..600d1ddc6 100644
--- a/plugins/archive/localization/en_US.inc
+++ b/plugins/archive/localization/en_US.inc
@@ -27,7 +27,7 @@ $labels['settingstitle'] = 'Archive';
 $labels['archivetype'] = 'Divide archive by';
 $labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
 $labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypethunderbirdmonth'] = 'Month - Thunderbird compatible (e.g. Archive/2012/2012-06)';
+$labels['archivetypetbmonth'] = 'Month - Thunderbird compatible (e.g. Archive/2012/2012-06)';
 $labels['archivetypefolder'] = 'Original folder';
 $labels['archivetypesender'] = 'Sender email';
 $labels['unkownsender'] = 'unknown';