change Message to NotificationMessage