Mark message as read even if not sending. Also code cleanup.