Bug - 827382 followup - fixing a regression on inbound
r=kaze
Merge pull request #7545 from etiennesegonzac/settings-inbound-fix

Bug 827382 followup - fixing a regression on inbound