diff --git a/io/messaging.go b/io/messaging.go
index 6b73b84a413f9c7d1fb8b49e6464a1c918785444..e6b5c60d82edcb72a66fdb4d1517b015428267a2 100644
--- a/io/messaging.go
+++ b/io/messaging.go
@@ -395,7 +395,7 @@ func (m *Messaging) receiveMessagesFromGateway(session user.Session,
 						// If message is non E2E, need to unpad payload
 						unpadded, err = e2e.Unpad(msg.Contents.Get())
 						if err == nil {
-							msg.Contents.Set(unpadded)
+							msg.Contents.SetRightAligned(unpadded)
 						}
 					}