unctionality to enable k-9 to decrypt and display RFC 2440 and RFC 3156
conforming messages (MIME-type: application/pgp-encrypted) in k-9 with
the help of Android Privacy Guard (APG)
Fixed a direct reference to APG which would have broken the
plugin-pattern which is in effect in the crypto-package. Replaced it
with an extension to the cryptoProvider interface
Added the functionality to add pgp encrypted messages to an email as attachments, as specified in the RFC3156
Intermediate commit. Not finished yet
Intermediate commit. Not finished yet
Added the attachment of "application/pgp-encrypted" to "multipart/encrypted"
Completed the attachment based pgp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/fsck/k9/activity/MessageCompose.java
Manually merged MessageCompose.java
Merge remote-tracking branch 'upstream/master'
Added tweaks to display decrypted content accordingly...
Added the workarounds to correctly display text-only messages. Encrypted and non-encrypted
Revert "Added the workarounds to correctly display text-only messages. Encrypted and non-encrypted"

This reverts commit 538e2ae1a3556b881ccfac7ea9d64b860e77fd01.
Revert "Added tweaks to display decrypted content accordingly..."

This reverts commit 9822048eafac3cf5cb270b2e3df5cad313f3a79b.
Revert "Manually merged MessageCompose.java"

This reverts commit 70ea87c82eac304274a70c0a845e5703677f7734.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of git://github.com/mkulicke/k-9 into mkulicke-master
resolve merge conflict