fix observer, notification and mail behaviour