diff --git a/apparmor.d/profiles-a-f/claws-mail b/apparmor.d/profiles-a-f/claws-mail
index 5c51af7c7..192884996 100644
--- a/apparmor.d/profiles-a-f/claws-mail
+++ b/apparmor.d/profiles-a-f/claws-mail
@@ -46,8 +46,8 @@ profile claws-mail @{exec_path} flags=(complain) {
   owner @{HOME}/ r,
   owner @{HOME}/.claws-mail/ rw,
   owner @{HOME}/.claws-mail/** rwl -> @{HOME}/.claws-mail/**,
-  owner @{HOME}/Mail/ rw,
-  owner @{HOME}/Mail/** rwl -> @{HOME}/Mail/**,
+  owner @{user_mail_dirs}/ rw,
+  owner @{user_mail_dirs}/** rwl -> @{user_mail_dirs}/**,
 
   owner /tmp/claws-mail-[0-9]*/ rw,
   owner /tmp/claws-mail-[0-9]*/@{hex} rw,
diff --git a/apparmor.d/tunables/home.d/apparmor.d b/apparmor.d/tunables/home.d/apparmor.d
index 1c0e73bf8..8a9189f8a 100644
--- a/apparmor.d/tunables/home.d/apparmor.d
+++ b/apparmor.d/tunables/home.d/apparmor.d
@@ -21,6 +21,7 @@
 @{XDG_VM_DIR}=".vm"
 @{XDG_VM_SHARES_DIR}="VM_Shares"
 @{XDG_IMG_DIR}="images"
+@{XDG_MAIL_DIR}="Mail"
 @{XDG_SCREENSHOTS_DIR}="Pictures/Screenshots"
 @{XDG_WALLPAPERS_DIR}="Pictures/Wallpapers"
 
@@ -53,6 +54,7 @@
 # Other user directories
 @{user_books_dirs}=@{HOME}/@{XDG_BOOKS_DIR} @{MOUNTS}/@{XDG_BOOKS_DIR}
 @{user_games_dirs}=@{HOME}/@{XDG_GAMES_DIR} @{MOUNTS}/@{XDG_GAMES_DIR}
+@{user_mail_dirs}=@{HOME}/@{XDG_MAIL_DIR} @{MOUNTS}/@{XDG_MAIL_DIR}
 @{user_projects_dirs}=@{HOME}/@{XDG_PROJECTS_DIR} @{MOUNTS}/@{XDG_PROJECTS_DIR}
 @{user_sync_dirs}=@{HOME}/@{XDG_SYNC_DIR} @{MOUNTS}/*/@{XDG_SYNC_DIR}
 @{user_torrents_dirs}=@{HOME}/@{XDG_TORRENTS_DIR} @{MOUNTS}/@{XDG_TORRENTS_DIR}