diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java
index a89edea7..86a5f8f3 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java
@@ -158,7 +158,6 @@ public class HawtDBStorageService implements IStorageService {
     }
 
     public void storePublishForFuture(PublishEvent evt) {
-        LOG.debug("storePublishForFuture store evt " + evt);
         List<PublishEvent> storedEvents;
         String clientID = evt.getClientID();
         if (!m_persistentMessageStore.containsKey(clientID)) {
@@ -168,6 +167,8 @@ public class HawtDBStorageService implements IStorageService {
         }
         storedEvents.add(evt);
         m_persistentMessageStore.put(clientID, storedEvents);
+        LOG.debug(String.format("Stored published message for client <%s> on topic <%s>, content %s", 
+                clientID, evt.getTopic(), new String(evt.getMessage())));
     }
 
     public List<PublishEvent> retrivePersistedPublishes(String clientID) {
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java
index e57beec6..3871d843 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java
@@ -166,7 +166,7 @@ public class SubscriptionsStore {
     }
 
     public void activate(String clientID) {
-        LOG.debug("activate re-activating subscriptions for clientID " + clientID);
+        LOG.debug(String.format("Activating subscriptions for clientID <%s>", clientID));
         subscriptions.activate(clientID);
     }