[dspam/f21] (2 commits) ...fix for bug #1193177