Renaming messages folder
Making notification simpler