diff --git a/lib/WebGUI/User.pm b/lib/WebGUI/User.pm
index 3327c0814..c09f9d6a7 100644
--- a/lib/WebGUI/User.pm
+++ b/lib/WebGUI/User.pm
@@ -409,6 +409,7 @@ sub delete {
     $db->write("DELETE FROM userSession WHERE userId=?",[$userId]);
 
     # remove inbox entries
+    $db->write("DELETE FROM inbox_messageState WHERE userId=?",[$userId]);
     $db->write("DELETE FROM inbox WHERE userId=? AND (groupId IS NULL OR groupId='')",[$userId]);
 
     # Shop cleanups