Update on Messages

still have some issues with deleting will be solved soon