A computer implemented method, apparatus, and computer usable program code for managing e-mail attachments. A determination is made as to whether a unique identifier is present in an e-mail message, wherein the unique is associated with an e-mail attachment in response to receiving the e-mail message from a client for delivery to a recipient. The e-mail attachment is attached to the e-mail message in response to the unique identifier being present. The e-mail message is sent with the e-mail attachment to the recipient.