Mail folders in the menu when "mail" manu is disabled

I have noticed that now if you disable "mail" menu and use mail block instead, when you're in the mail folder, the mail folders appear in the root menu besides the block, which breaks menu layout.

Here I put a patch which displays mail folders in the menu only when parent menu "mail" is enabled.