am f7bb7a2e: Merge "Don\'t convert \'+\' into \' \' for subject title and body" into jb-ub-mail-ur9

* commit 'f7bb7a2e5a0d2c3ecd6ef13e381e1a6acc4ff0cd':
  Don't convert '+' into ' ' for subject title and body