diff --git a/source/client/client.d b/source/client/client.d
index b23edd2..1612a0f 100644
--- a/source/client/client.d
+++ b/source/client/client.d
@@ -172,7 +172,10 @@ public final class ButterflyClient : Thread
                             /* Store the message in the mailbox */
                             Mail storedMail = storeMail(storeFolder, mailBlock);
 
-                            responseBlock["response"]["mailID"] = storedMail.getMailID();
+							/* Set the response to be the mail message's ID */
+							JSONValue response;
+							response["mailID"] =storedMail.getMailID();
+                            responseBlock["response"] = response;
                         }
                         else
                         {
diff --git a/source/client/mail.d b/source/client/mail.d
index f4b01c3..ad3ccb8 100644
--- a/source/client/mail.d
+++ b/source/client/mail.d
@@ -61,8 +61,6 @@ public final class Mailbox
             folders ~= new Folder(this, dirEntry.name());
         }
 
-        /* TODO: Implement me */
-
         return folders;
     }