Merged app-mail-notification UI [tracker #1536]