Merge pull request #10265 from dominickuo/bug-870320

Bug 870320 - [email] adjust attachments on compose page, r=asutherland(cherry picked from commit ceb11c3bd0b3c7a022f87c1adb80610c4d9d4275)