Better handling of mappings in the vicinity of mappings.
svn path=/trunk/KDE/kdepimlibs/; revision=1143639