Message Notification Mail and small bug fix