Bug 975535 - E.me followups [r=ranbena]