Important changes, removed the unnecessary timestamp code, and fixed messages beeing joined when they should sandwich messages from another user.