[kdepim/f17] (6 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  e4a8981... KMail - multipart messages displayed twice (kde#318182) (*)
  5b492c3... KMail - multipart messages displayed twice (kde#318182) (*)
  ef9dfbc... KMail - multipart messages displayed twice (kde#318182) (*)
  b7ad247... Merge branch 'master' into f19
  5f77212... Merge branch 'f19' into f18
  23efbfd... Merge branch 'f18' into f17

(*) This commit already existed in another branch; no separate mail sent