transport FIXED-IN: 4.8.5 BUG: 302344 (cherry picked from commit d2a1a9eb) Conflicts: plugins/messageviewer/bodypartformatter/text_calendar.cpp