Various technologies and techniques are disclosed that enhance the security of electronic mail messages and folders. Messages that are deemed to be less secure and have a higher security risk, such as unsolicited commercial e-mail (i.e. SPAM) and phishing messages, are reformatted and displayed in plain text with hyperlinks disabled in certain circumstances. For example, messages in a junk e-mail folder may be reformatted and displayed in plain text with hyperlinks disabled to make them safer for the user to interact with.