diff --git a/api/client.go b/api/client.go
index 5512d33f665539fad95d62543db7e3e829485e8f..7880fa697821243fd6b262389aadcc4e4e525789 100644
--- a/api/client.go
+++ b/api/client.go
@@ -186,6 +186,8 @@ func OpenClient(storageDir string, password []byte, parameters params.Network) (
 		parameters:  parameters,
 	}
 
+	c.runner.Add(c.storage.Partition().ClearMessages())
+
 	return c, nil
 }
 
diff --git a/network/message/parse/partition.go b/network/message/parse/partition.go
index e7fbbfd313379570d3ec522d23053fbd025456cf..ad66ba2f30e09434dc090f07e0917137973d9b00 100644
--- a/network/message/parse/partition.go
+++ b/network/message/parse/partition.go
@@ -12,6 +12,7 @@ import (
 	"gitlab.com/elixxir/client/interfaces/message"
 	"gitlab.com/elixxir/client/storage"
 	"gitlab.com/xx_network/primitives/id"
+	"gitlab.com/xx_network/primitives/netTime"
 	"time"
 )
 
@@ -80,9 +81,9 @@ func (p Partitioner) HandlePartition(sender *id.ID, _ message.EncryptionType,
 		// Handle the message ID
 		messageID := p.session.Conversations().Get(sender).
 			ProcessReceivedMessageID(fm.GetID())
-
+		storeageTimestamp := netTime.Now()
 		return p.session.Partition().AddFirst(sender, fm.GetType(),
-			messageID, fm.GetPart(), fm.GetNumParts(), fm.GetTimestamp(),
+			messageID, fm.GetPart(), fm.GetNumParts(), fm.GetTimestamp(), storeageTimestamp,
 			fm.GetSizedContents(), relationshipFingerprint)
 	} else {
 		// If it is a subsequent message part, handle it as so