diff --git a/src/main/java/dslab/mailbox/DMTPConnection.java b/src/main/java/dslab/mailbox/DMTPConnection.java
index bbb19f2..6fec0e4 100644
--- a/src/main/java/dslab/mailbox/DMTPConnection.java
+++ b/src/main/java/dslab/mailbox/DMTPConnection.java
@@ -87,12 +87,10 @@ public class DMTPConnection implements Runnable {
                     String subject = "";
                     if (userInput.split("\\s+").length > 1)
                         subject = userInput.split("\\s+", 2)[1];
-                    logger.info("Setting subject to: " + subject);
                     msg.setSubject(subject);
                     out.println("ok");
                 } else if ("data".equals(userInput.split("\\s+")[0])) {
                     String data = userInput.split("\\s+", 2)[1];
-                    logger.info("Setting data to: " + data);
                     msg.setData(data);
                     out.println("ok");
                 } else {
@@ -111,6 +109,7 @@ public class DMTPConnection implements Runnable {
     }
 
     private synchronized void storeMessage() throws UnknownRecipientException {
+        logger.info("Storing message " + msg.toString());
         String errorUnknownRecipient = "";
         for (Email recipient : this.msg.getTo()) {
             if (this.messageStorage.containsKey(recipient)) {
diff --git a/src/main/java/dslab/mailbox/DMTPListener.java b/src/main/java/dslab/mailbox/DMTPListener.java
index c791547..f17c02c 100644
--- a/src/main/java/dslab/mailbox/DMTPListener.java
+++ b/src/main/java/dslab/mailbox/DMTPListener.java
@@ -50,7 +50,7 @@ public class DMTPListener extends Thread {
     }
 
     public void shutdown() {
-        logger.finer("Shutting down DMTPHandler " + this.toString());
+        logger.finer("Shutting down DMTPListener " + this.toString());
         for (DMTPConnection client : clients) {
             if (client != null)
                 client.shutdown();