Incoming emails that are already part of a matter's conversation are automatically moved within the matter's conversation panel with attachments to the email also saved within the matter's conversation panel and also the matter's file folder. The system ensures that outgoing emails are also saved, including all attachments. Users receive notifications when an email is received that is related to an existing matter. This system saves time and eliminates the need for manual saving and uploading of emails and attachments to those emails.