working scheduling
fixed conflicts
Merge pull request #6 from ranleung/master

Working scheduling for unsaved messages