PR: 144575 ([1]), 138786 ([2]) Submitted by: Ganael Laplanche <ganael.laplanche@martymac.com> [1], Martin Laabs <spamtrap@martinlaabs.de> [2] Patch by: Ganael Laplanche <ganael.laplanche@martymac.com>