Only show N unread Emails when N > 0
Merge remote-tracking branch 'chiiph/bug/display_new_mail_count' into develop