Content unmaps when block updated

Hi Levon. The inbox block still needs finishing: