Bug 1062630 - Port bug 1059113 to c-c MAPI part r=Standard8 a=CLOSED TREE a=bustage fix