-(require 'epa-dired)
-(epa-dired-setup)
+(autoload 'epa-list-keys "epa")
+
+(autoload 'epa-dired-mode-hook "epa-dired")
+(add-hook 'dired-mode-hook 'epa-dired-mode-hook)
+
+(require 'epa-file)
+(epa-file-enable)
+
+(autoload 'epa-mail-mode "epa-mail")
+(add-hook 'mail-mode-hook 'epa-mail-mode)
(provide 'epa-setup)