merge SVN commit 1021458 by tmcguire:

After adding a locally added message to the server, don't put it in the deletion map.

Should fix kolab/issue3833.

However, there are some stale deletion maps because of this bug, I need to think of a clever
way to get rid of them...

svn path=/tags/kdepim/enterprise35.0.20090807.1008353/kdepim/; revision=1021517