Quickly added simple merge commit detection
Handle message delete
Attach message edit timestamp
Added placeholder for empty messages
In the middle of some connection refactoring