[CLC-1639] Modifications for bmail feed