Bug 1079220 - Modify file structure of Instantbird to match toolkit changes, port additional Thunderbird change.
Bug 1083487 - Followup fix for bug 1081682. r=Callek a=bustage-fix

--HG--
extra : amend_source : 93eb95f099baa5179bf2b7486704c3b6fd14c824