Revert "Merge branch 'master' of https://github.com/aipocom/aipo.git into bugfix/webmail-uid-file"

This reverts commit 1c018a5e7e690282c38d5f799aeeb932e71c920e, reversing
changes made to e3f0ef870a28531268f14033ffdbf7a8aec58d96.