CamelIMAPXServer: A little code reorganization.
CamelIMAPXServer: A little code reorganization.

matzipan/evolution-data-server,matzipan/evolution-data-server,matzipan/evolution-data-server,tintou/evolution-data-server,tintou/evolution-data-server,matzipan/evolution-data-server,tintou/evolution-data-server,matzipan/evolution-data-server,tintou/evolution-data-server