Revert "Revert "Merge pull request #219 from aipocom/features/user-webmail-size""

This reverts commit fb1b2147758a0c6111a64f525f26b353825d76f6.