Add back option to notify for every message