diff --git a/state.go b/state.go
index fa77b20..a438ba7 100644
--- a/state.go
+++ b/state.go
@@ -511,6 +511,12 @@ func (s *State) MessageAdd(message *Message) error {
 			if message.Attachments != nil {
 				m.Attachments = message.Attachments
 			}
+			if message.Timestamp != "" {
+				m.Timestamp = message.Timestamp
+			}
+			if message.Author != nil {
+				m.Author = message.Author
+			}
 
 			return nil
 		}