Don't alter Message-ID of a draft when sending (#1489409)
Fix references to 'default' skin
CS fixes