Merged revisions 1142672,1142680-1142681,1142714 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

........
  r1142672 | vkrause | 2010-06-25 13:18:49 +0200 (Fri, 25 Jun 2010) | 2 lines
  
  don't confuse me when I have multiple instances running at the same time
........
  r1142680 | tilladam | 2010-06-25 13:43:48 +0200 (Fri, 25 Jun 2010) | 1 line
  
  Reuse the ETM for speed reasons.
........
  r1142681 | tilladam | 2010-06-25 13:44:17 +0200 (Fri, 25 Jun 2010) | 1 line
  
  Make sure to properly end the login task in the case of wrong configuration.
........
  r1142714 | vkrause | 2010-06-25 15:15:11 +0200 (Fri, 25 Jun 2010) | 2 lines
  
  fix connecting to IMAP in release builds
........

svn path=/branches/work/komo/kdepim/; revision=1142716