Bug 925774 - Change composition's access key for File | Attach to "h", for consistency with accesskey "h" for message reader's Message | Attachments. r+ui-r=squib

--HG--
extra : rebase_source : 411cc7497ae9557d080f7e75cc142b00f968adc3
Bug 939481 - No sync preferences defined for some Privacy & Security settings. r=IanN

--HG--
extra : rebase_source : 0e2a02efe95315afd605899eeab8c7417ffef1e9