A system, computer program product and method of keeping track of an attachment that has been detached from an e-mail message are provided. Generally, a table on which an attachment that has been detached from an e-mail message is cross-referenced to its storage location is used. Further, a link is inserted into the e-mail message to facilitate access to the detached attachment. If the attachment is ever moved from its storage location to a new storage location, the cross-referencing table is updated to reflect the new storage location. The link is also updated to facilitate access to the attachment at the new storage location.