Some changes to Maildir for deployment; still not identifying signed/encrypted emails correctly