Fixed naming of default folders

Makefile

@@ -254,7 +254,7 @@ tls_session_timeout: 1440
 #        autocreate_post option must be enabled.
 #        #
 
-autocreate_inbox_folders: Drafts | Sent | Spam | Deleted Items
+autocreate_inbox_folders: Drafts | Sent | Junk | Trash
 
 #  Autocreate_post
 #  ---------------
@@ -300,7 +300,7 @@ autocreate_quota_messages: 0
 #    Leading and trailing whitespace is stripped from each folder, so a
 #    setting of "Junk | Trash" will create two folders: "Junk" and
 #    "Trash". 
-autocreate_sieve_folders: Drafts | Sent | Spam | Deleted Items
+autocreate_sieve_folders: Drafts | Sent | Junk | Trash
 
 #  Autocreate_sieve_script
 #  -----------------------
@@ -333,7 +333,7 @@ autocreate_sieve_folders: Drafts | Sent | Spam | Deleted Items
 #    A list of folder names, separated by "|", that the users get automatically subscribed to,
 #    when their INBOX is created. These folder names must have been included in the
 #    autocreateinboxfolders option of the imapd.conf. 
-autocreate_subscribe_folders: Drafts | Sent | Spam | Deleted Items
+autocreate_subscribe_folders: Drafts | Sent | Junk | Trash
 
 #  Autocreate_subscribe_sharedfolders
 #  ----------------------------------