Revert "Merge branch 'cperello/sogo-webmail-fixes'"

This reverts commit b511f062ee57de49d040f9c0abadc2eebc28ef4d, reversing
changes made to 56e22718202d37c7f13531252b799329ae5e7d70.