Conflicts: kmail/autotests/cryptostateindicatorwidgettest.cpp kmail/editor/kmcomposewin.cpp kmail/kmmainwidget.cpp kmail/kmmainwidget.h kmail/tests/CMakeLists.txt korgac/mailclient.cpp messagecomposer/sender/akonadisender.cpp