diff --git a/backup_imap/backup_imap.py b/backup_imap/backup_imap.py
index 96ba2ba..4ff5faa 100644
--- a/backup_imap/backup_imap.py
+++ b/backup_imap/backup_imap.py
@@ -159,8 +159,7 @@ class BackupImap:
                                 subject = f"{original_subject}_{counter}"
                                 message_path = os.path.join(
                                     mailbox_path,
-                                    subject,
-                                    '.eml'
+                                    f"{subject}.eml"
                                 )
                                 counter += 1
                             try:
@@ -177,8 +176,7 @@ class BackupImap:
                                 if error.errno == 36: # File name too long
                                     message_path = os.path.join(
                                         mailbox_path,
-                                        f"message_uid_{message_uid.decode()}",
-                                        '.eml'
+                                        f"message_uid_{message_uid.decode()}.eml"
                                     )
                                     with open(message_path, 'wb') as file_pointer:
                                         file_pointer.write(data)