Fix #2546 (ugly tb with the gpg plugin)