Update README.md

1 files changed, 43 insertions, 5 deletions

diff --git a/README.md b/README.md
index bffc5733f..bc7c44417 100644
--- a/README.md
+++ b/README.md
@@ -35,10 +35,12 @@ our individual changes:
 * increased avatar-sizes in account- and contact-details with prefering XMPP-avatars over addressbook avatars
 * in-app self updater with dayly check for updates
 * moved writing info from chatwindow into actionbar-subtitle
+* show lastseen info in actionbar-subtitle
 * display group chat members in actionbar-subtitle
 * images are transfered as JPEG
 * support more file-types for file-transfer (pdf, doc, docx, txt, m4a, m4b, mp3, mp2, wav, aac, aif, aiff, aifc, mid, midi, 3gpp, avi, mp4, mpeg, mpg, mpe, mov, 3gp, apk, vcf, ics, zip, rar)
 * show contacts name in locations shared in conferences
+* OpenPGP end-to-end encryption methode is disabled
 
 ### XMPP Features
 
@@ -114,9 +116,7 @@ Our modified version of Conversation can be downloaded from github [releases](ht
 
 #### How do I create an account?
 
-With our Conversations app you can only create and use accounts on `pix-art.de`. You can create your own account for free. Aftre creating your own `pix-art.de` account you'll find me in your contact list. If you have any questions about our app or our service feel free to ask me.
-
-You can join our conference room on `support@room.pix-art.de`.
+With our Conversations app you can only create and use accounts on `pix-art.de`. You can create your own account for free. You only need a nickname and a password. You don't need to add `@pix-art.de` to your nickname. After creating your own `pix-art.de` account you'll find me in your contact list. If you have any questions about our app or our service feel free to ask me or join our support-conference `support@room.pix-art.de`.
 
 #### How does the address book integration work?
 
@@ -168,7 +168,7 @@ everybody in your contact list to know that you have been using your computer at
 In the past status has been used to judge the likelihood of whether or not your
 messages are being read. This is no longer necessary. With Chat Markers
 (XEP-0333, supported by Conversations since 0.4) we have the ability to **know**
-whether or not your messages are being read.  Similar things can be said for
+whether or not your messages are being read. Similar things can be said for
 priorities. In the past priorities have been used (by servers, not by clients!)
 to route your messages to one specific client. With carbon messages (XEP-0280,
 supported by Conversations since 0.1) this is no longer necessary. Using
@@ -190,7 +190,45 @@ other clients.
 
 #### Encryption methodes
 
-At the moment we have disabled the end-to-end encryption methodes because we force TLS encrypted connections. Unecrypted connections were denied. 
+You can choose between different end-to-end encryption methodes, which are explained in the following lines. Our Server only accepts TLS encrypted connections to clients and only allows unencrypted connections to other server, if there is no way to encrypt the connections. If you are chatting with users to other servers, you should use an end-to-end encryption methode or ask me to look if the server-connections are encrypted or not.
+
+#### Why are there three end-to-end encryption methods and which one should I choose?
+
+In most cases OTR should be the encryption method of choice. It works out of the box with most contacts as long as they are online. However, openPGP can, in some cases, (message carbons to multiple clients) be more flexible. Unlike OTR, OMEMO works even when a contact is offline, and works with multiple devices. It also allows asynchronous file-transfer when the server has [HTTP File Upload](http://xmpp.org/extensions/xep-0363.html). However, OMEMO is not as widely supported as OTR and is currently implemented only by Conversations. OMEMO should be preffered over OTR for contacts who use Conversations.
+
+#### How do I use OpenPGP
+
+Before you continue reading you should note that the OpenPGP support in
+Conversations is experimental. This is not because it will make the app unstable
+but because the fundamental concepts of PGP aren't ready for widespread use.
+The way PGP works is that you trust Key IDs instead of JID's or email addresses.
+So in theory your contact list should consist of Public-Key-IDs instead of
+JID's. But of course no email or XMPP client out there implements these
+concepts. Plus PGP in the context of instant messaging has a couple of
+downsides: It is vulnerable to replay attacks, it is rather verbose, and
+decrypting and encrypting takes longer than OTR. It is however asynchronous and
+works well with message carbons.
+
+In our version, OpenPGP is diabled because of the problems listed above.
+
+To use OpenPGP you have to install the open source app
+[OpenKeychain](http://www.openkeychain.org) and then long press on the account in
+manage accounts and choose renew PGP announcement from the contextual menu.
+
+#### How does the encryption for conferences work?
+
+For conferences the only supported encryption method is OpenPGP (OTR does not
+work with multiple participants). Every participant has to announce their
+OpenPGP key (see answer above). If you would like to send encrypted messages to
+a conference you have to make sure that you have every participant's public key
+in your OpenKeychain. Right now there is no check in Conversations to ensure
+that. You have to take care of that yourself. Go to the conference details and
+touch every key id (The hexadecimal number below a contact). This will send you
+to OpenKeychain which will assist you on adding the key.  This works best in
+very small conferences with contacts you are already using OpenPGP with. This
+feature is regarded experimental. Conversations is the only client that uses
+XEP-0027 with conferences. (The XEP neither specifically allows nor disallows
+this.)
 
 #### I found a bug