[CLC-1639] Modified bMail feed for badges