Add github sync for i2p.i2p-bote

I2P-Bote 0.4.8

.github/workflows/sync.yaml

@@ -0,0 +1,66 @@
+# GitHub Actions workflow file to sync an external repository to this GitHub mirror.
+# This file was automatically generated by go-github-sync.
+#
+# The workflow does the following:
+# - Runs on a scheduled basis (and can also be triggered manually)
+# - Clones the GitHub mirror repository
+# - Fetches changes from the primary external repository
+# - Applies those changes to the mirror repository
+# - Pushes the updated content back to the GitHub mirror
+#
+# Authentication is handled by the GITHUB_TOKEN secret provided by GitHub Actions.
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate Github Actions Environment
+        run: if [ "$GITHUB_ACTIONS" != "true" ]; then echo 'This script must be run in a GitHub Actions environment.'; exit 1; fi
+      - name: Checkout GitHub Mirror
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Configure Git
+        run: |-
+          git config user.name 'GitHub Actions'
+          git config user.email 'actions@github.com'
+      - env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        name: Sync Primary Repository
+        run: |-
+          # Add the primary repository as a remote
+          git remote add primary https://i2pgit.org/I2P_Developers/i2p.i2p-bote.git
+
+          # Fetch the latest changes from the primary repository
+          git fetch primary
+
+          # Check if the primary branch exists in the primary repository
+          if git ls-remote --heads primary master | grep -q master; then
+            echo "Primary branch master found in primary repository"
+          else
+            echo "Error: Primary branch master not found in primary repository"
+            exit 1
+          fi
+
+          # Check if we're already on the mirror branch
+          if git rev-parse --verify --quiet master; then
+            git checkout master
+          else
+            # Create the mirror branch if it doesn't exist
+            git checkout -b master
+          fi
+
+
+          # Force-apply all changes from primary, overriding any conflicts
+          echo "Performing force sync from primary/master to master"
+          git reset --hard primary/master
+
+
+          # Push changes back to the mirror repository
+          git push origin master
+name: Sync Primary Repository to GitHub Mirror
+"on":
+  push: {}
+  schedule:
+    - cron: 0 * * * *
+  workflow_dispatch: {}

.gitignore

@@ -0,0 +1,21 @@
+# Config files
+local.properties
+signing.properties
+
+# Gradle
+.gradle/
+build/
+android/build
+core/build
+webapp/build
+
+# I2P-specific ignores
+android/src/main/res/raw/certificates_zip
+
+# James Server dependencies
+webapp/cache
+webapp/libs
+
+# Standalone WAR user files
+webapp/i2pbote
+webapp/logs

.mtn-ignore

@@ -0,0 +1,94 @@
+# General ignores
+^.settings
+
+# Android-specific ignores
+lint.xml
+local.properties
+signing.properties
+
+#IntelliJ IDEA
+^.idea
+.*.iml
+.*.ipr
+.*.iws
+
+#Gradle
+^.gradle
+build
+
+# I2P-specific ignores
+^android/src/main/res/raw/certificates_zip
+
+# Just to try and prevent some noob disasters.
+# Use mtn add --no-respect-ignore foo.jar to ignore this ignore list
+
+# Temporary/build files
+i2pbote.jar
+i2pbote.xpi2p
+i2pbote-update.xpi2p
+~$
+
+# Temporary/build dirs
+^ant_build
+^plugin/plugin.tmp
+^core/build/
+^webapp/build/
+
+# Build property overrides
+override.properties
+
+# Downloaded JavaMail libraries
+mailapi-.*.jar
+
+# Downloaded BouncyCastle Provider libraries
+bcprov-jdk15on-.*.jar
+
+# Downloaded IMAP libraries
+apache-james-imap-api-0.4-.*.jar
+apache-james-imap-message-0.4-.*.jar
+apache-james-imap-processor-0.4-.*.jar
+apache-james-mailbox-api-0.6-.*.jar
+apache-james-mailbox-store-0.6-.*.jar
+apache-mime4j-core-.*.jar
+apache-mime4j-dom-.*.jar
+commons-codec-.*.jar
+commons-collections-.*.jar
+commons-configuration-.*.jar
+commons-io-.*.jar
+commons-lang-.*.jar
+commons-logging-.*.jar
+csrfguard-.*.jar
+james-server-filesystem-api-3.0.0-beta5-SNAPSHOT.jar
+james-server-lifecycle-api-3.0.0-beta5-SNAPSHOT.jar
+james-server-protocols-imap4-3.0.0-beta5-SNAPSHOT.jar
+james-server-protocols-library-3.0.0-beta5-SNAPSHOT.jar
+james-server-util-3.0.0-beta5-SNAPSHOT.jar
+jutf7-1.0.0.jar
+log4j-1.2.17.jar
+netty-3.3.1.Final.jar
+protocols-api-1.6.4-.*.jar
+protocols-imap-1.6.4-.*.jar
+protocols-netty-1.6.4-.*.jar
+slf4j-api-.*.jar
+slf4j-log4j12-.*.jar
+
+# Downloaded SMTP libraries
+subethasmtp-3.1.7.jar
+
+# Downloaded JUnit libraries
+junit-4.8.1.jar
+
+# Downloaded Mockito libraries
+mockito-core-2.0.31-beta.jar
+
+# Downloaded jMock libraries
+cglib-nodep-2.2.3.jar
+hamcrest-core-1.3.jar
+hamcrest-library-1.3.jar
+hamcrest-unit-test-1.3.jar
+jmock-2.6.0.jar
+jmock-junit3-2.6.0.jar
+jmock-junit4-2.6.0.jar
+jmock-legacy-2.6.0.jar
+jmock-script-2.6.0.jar
+objenesis-1.0.jar

.travis.yml

@@ -0,0 +1,54 @@
+language: java
+
+jdk:
+  - oraclejdk11
+  - oraclejdk9
+  - oraclejdk8
+  - openjdk12
+  - openjdk11
+  - openjdk10
+  - openjdk9
+  - openjdk8
+
+matrix:
+  include:
+    - jdk: openjdk7
+      sudo: required
+      before_install: # Work around missing crypto in openjdk7
+        - wget http://security.ubuntu.com/ubuntu/pool/main/g/gcc-5/gcc-5-base_5.4.0-6ubuntu1~16.04.10_amd64.deb
+        - wget http://security.ubuntu.com/ubuntu/pool/main/g/gcc-5/libgomp1_5.4.0-6ubuntu1~16.04.10_amd64.deb
+        - wget http://archive.ubuntu.com/ubuntu/pool/main/n/ncurses/libtinfo5_6.0+20160213-1ubuntu1_amd64.deb
+        - wget http://archive.ubuntu.com/ubuntu/pool/main/g/gettext/gettext_0.19.7-2ubuntu3.1_amd64.deb
+        - sudo dpkg -i gcc-5-base_5.4.0-6ubuntu1~16.04.10_amd64.deb
+        - sudo dpkg -i libgomp1_5.4.0-6ubuntu1~16.04.10_amd64.deb
+        - sudo dpkg -i libtinfo5_6.0+20160213-1ubuntu1_amd64.deb
+        - sudo dpkg -i gettext_0.19.7-2ubuntu3.1_amd64.deb
+        - export JAVA7_HOME=$(jdk_switcher home openjdk7)
+        - sudo wget "https://bouncycastle.org/download/bcprov-ext-jdk15on-158.jar" -O "${JAVA_HOME}/jre/lib/ext/bcprov-ext-jdk15on-158.jar"
+        - sudo perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/java-7-openjdk/security/java.security
+        - echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | sudo tee -a /etc/java-7-openjdk/security/java.security
+      install:
+        - export TARGET_JAVA_HOME=$JAVA_HOME
+        - jdk_switcher use oraclejdk8
+        - ./gradlew assemble
+  allow_failures:
+    - jdk: openjdk12
+
+before_install:
+  - wget http://security.ubuntu.com/ubuntu/pool/main/g/gcc-5/gcc-5-base_5.4.0-6ubuntu1~16.04.10_amd64.deb
+  - wget http://security.ubuntu.com/ubuntu/pool/main/g/gcc-5/libgomp1_5.4.0-6ubuntu1~16.04.10_amd64.deb
+  - wget http://archive.ubuntu.com/ubuntu/pool/main/n/ncurses/libtinfo5_6.0+20160213-1ubuntu1_amd64.deb
+  - wget http://archive.ubuntu.com/ubuntu/pool/main/g/gettext/gettext_0.19.7-2ubuntu3.1_amd64.deb
+  - sudo dpkg -i gcc-5-base_5.4.0-6ubuntu1~16.04.10_amd64.deb
+  - sudo dpkg -i libgomp1_5.4.0-6ubuntu1~16.04.10_amd64.deb
+  - sudo dpkg -i libtinfo5_6.0+20160213-1ubuntu1_amd64.deb
+  - sudo dpkg -i gettext_0.19.7-2ubuntu3.1_amd64.deb
+  - export JAVA7_HOME=$(jdk_switcher home openjdk7)
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/

.tx/config

@@ -1,22 +1,42 @@
-[I2P.plugin_i2pbote]
-source_file = locale/messages_en.po
-source_lang = en
-trans.ar = locale/messages_ar.po
-trans.cs = locale/messages_cs.po
-trans.de = locale/messages_de.po
-trans.es = locale/messages_es.po
-trans.fr = locale/messages_fr.po
-trans.hu = locale/messages_hu.po
-trans.it = locale/messages_it.po
-trans.nl = locale/messages_nl.po
-trans.nb = locale/messages_nb.po
-trans.pl = locale/messages_pl.po
-trans.pt = locale/messages_pt.po
-trans.ru = locale/messages_ru.po
-trans.sv_SE = locale/messages_sv.po
-trans.uk_UA = locale/messages_uk.po
-trans.vi = locale/messages_vi.po
-trans.zh_CN = locale/messages_zh.po
-
 [main]
-host = http://www.transifex.net
+host = https://www.transifex.com
+lang_map = he: iw, id: in, pt_BR: pt-rBR, ru_RU: ru, sv_SE: sv, tr_TR: tr, uk_UA: uk, yi: ji, zh_CN: zh
+
+[I2P.plugin_i2pbote]
+file_filter = webapp/src/main/locale/messages_<lang>.po
+source_file = webapp/src/main/locale/messages_en.po
+source_lang = en
+minimum_perc = 40
+
+[I2P.plugin_i2pbote_userguide]
+file_filter = webapp/src/main/webapp/html/userGuide_<lang>.html
+source_file = webapp/src/main/webapp/html/userGuide.html
+source_lang = en
+minimum_perc = 50
+
+[I2P.plugin_i2pbote_faq]
+file_filter = webapp/src/main/webapp/html/FAQ_<lang>.html
+source_file = webapp/src/main/webapp/html/FAQ.html
+source_lang = en
+minimum_perc = 50
+
+[I2P.android_bote]
+file_filter = android/src/main/res/values-<lang>/strings.xml
+source_file = android/src/main/res/values/strings.xml
+source_lang = en
+type = ANDROID
+minimum_perc = 50
+
+[I2P.android_bote_help_start]
+file_filter = android/src/main/res/raw-<lang>/help_start.html
+source_file = android/src/main/res/raw/help_start.html
+source_lang = en
+type = HTML
+minimum_perc = 50
+
+[I2P.android_bote_help_identities]
+file_filter = android/src/main/res/raw-<lang>/help_identities.html
+source_file = android/src/main/res/raw/help_identities.html
+source_lang = en
+type = HTML
+minimum_perc = 50

README.md

@@ -0,0 +1,140 @@
+# I2P-Bote
+
+[![Build Status](https://travis-ci.org/i2p/i2p.i2p-bote.svg?branch=master)](https://travis-ci.org/i2p/i2p.i2p-bote)
+
+I2P-Bote is a plugin for I2P that allows users to send and receive emails while preserving privacy. It does not need a mail server because emails are stored in a distributed hash table. They are automatically encrypted and digitally signed, which ensures no one but the intended recipient can read the email, and third parties cannot forge them.
+
+## Features
+
+- Themeable webmail interface
+- User interface translated in many languages
+- One-click creation of email accounts (called email identities)
+- Emails can be sent under a sender identity, or anonymously
+- ElGamal, Elliptic Curve, and NTRU Encryption
+- Encryption and signing is transparent, without the need to know about PGP
+- Delivery confirmation
+- Basic support for short recipient names
+- IMAP / SMTP
+
+### Planned Features
+
+- Custom folders
+- Sending and receiving via relays, similar to Mixmaster
+- Lots of small improvements
+
+## Build process
+
+### Dependencies:
+
+- Java SDK (preferably Oracle/Sun or OpenJDK) 1.7.0 or higher
+- Apache Ant 1.8.0 or higher
+- Gradle 2.14.1
+
+### Gradle
+
+The build system is based on Gradle. There are several methods for setting Gradle up:
+
+* It can be downloaded from [the Gradle website](http://www.gradle.org/downloads).
+
+* Most distributions will have Gradle packages. Be careful to check the provided version; Debian and Ubuntu have old versions in their main repositories. There is a [PPA](https://launchpad.net/~cwchien/+archive/gradle) for Ubuntu with the latest version of Gradle.
+
+* A Gradle wrapper is provided in the codebase. It takes all the same commands as the regular `gradle` command. The first time that any command is run, it will automatically download, cache and use the correct version of Gradle. This is the simplest way to get started with the codebase. To use it, replace `gradle` with `./gradlew` (or `./gradlew.bat` on Windows) in the commands below.
+
+Gradle will pull dependencies over the clearnet by default. To use Tor, create a `gradle.properties` file in `i2p.android.base` containing:
+
+    ```
+    systemProp.socksProxyHost=localhost
+    systemProp.socksProxyPort=9150
+    ```
+
+### Building the I2P plugin
+
+```
+gradle :webapp:plugin
+```
+
+The plugin will be placed in `i2p.i2p-bote/webapp/build/plugin`.
+
+### Building the standalone WAR
+
+```
+gradle :webapp:war
+```
+
+The WAR will be placed in `i2p.i2p-bote/webapp/build/libs`.
+
+### Running the standalone WAR
+
+Ensure you have an I2P router running locally with an I2CP server port open (on port 7654). Then run:
+
+```
+gradle :webapp:tomcatRunWar
+```
+
+This will build and run the WAR. (Jetty currently does not work.)
+
+The data directory will be placed in `i2p.i2p-bote/webapp/i2pbote`; logs will be in `i2p.i2p-bote/webapp/logs`.
+
+## Android build process
+
+### Additional dependencies:
+
+- [I2P source](https://github.com/i2p/i2p.i2p)
+- Android SDK 25
+- Android Build Tools 25.0.2
+- Android Support Repository
+
+### Preparation
+
+1. Download the Android SDK. The simplest method is to download Android Studio.
+
+2. Create a `local.properties` file in `i2p.i2p-bote/android` containing:
+
+    ```
+    i2psrc=/path/to/i2p.i2p
+    ```
+
+3. If you want to use a local copy of the I2P Android client library, install it in your local Maven repository with:
+
+    ```
+    cd path/to/i2p.android.base
+    ./gradlew client:installArchives
+    ```
+
+### Building from the command line
+
+1. Create a `local.properties` file in `i2p.i2p-bote` containing:
+
+    ```
+    sdk.dir=/path/to/android-studio/sdk
+    ```
+
+2. `gradle :android:assembleDebug`
+
+3. The APK will be placed in `i2p.i2p-bote/android/build/apk`.
+
+### Building with Android Studio
+
+1. Import `i2p.i2p-bote` into Android Studio. (This creates the `local.properties` file automatically).
+
+2. Build and run the app (`Shift+F10`).
+
+### Signing release builds
+
+1. Create a `signing.properties` file in `i2p.i2p-bote` containing:
+
+    ```
+    STORE_FILE=/path/to/android.keystore
+    STORE_PASSWORD=store.password
+    KEY_ALIAS=key.alias
+    KEY_PASSWORD=key.password
+    ```
+
+2. `gradle assembleRelease`
+
+## More information
+
+The links below only work within I2P, i.e., make sure you are running I2P and your browser is using the proxy at localhost:4444.
+
+- http://i2pbote.i2p I2P-Bote homepage
+- http://forum.i2p/viewforum.php?f=35 I2P-Bote forum

TODO

@@ -0,0 +1,28 @@
+User guide
+- Howto for IMAP/SMTP
+Email composition
+- "Include sent time" as an option, pre-filled with settings default
+Identities
+- Generate dests in background rather than needing a dedicated tab open
+IMAP/SMTP
+- "Force SSL" option
+  - When disabled, users can connect with "insecure" or "STARTTLS"
+  - When enabled, users can connect with "SSL"
+- Separate password cache (IMAP auth should not unlock webui)
+
+Not-yet-implemented
+- Drafts folder
+- User-defined folders
+- Automatically disable timestamps when using mail routes
+- Random offset for fetch interval (#1360)
+- Per-identity settings (#1359)
+  - Fetch interval
+- Mail route per-hop settings
+  - Delay (#1361)
+  - Fixed forward time
+- Traffic correlation countermeasures at relays
+  - Mixing anonymity (minimum threshold on relay packets to send)
+  - Constant traffic (test and dummy messages)
+  - Balanced incoming/outgoing ratio
+  - Packet padding
+- Retrieving email via relays

WebContent/FAQ.html

@@ -1,462 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>Frequently Asked Questions</title>
-	<meta http-equiv="Content-Language" content="English" />
-	<meta name="Robots" content="index,follow" />
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<link rel="stylesheet" type="text/css" href="css/style.css" media="screen" />
-</head>
-<body>
-
-<div id="wrap">
-
-	<div id="top">
-				<div class="rights">	</div>
-				<div id="search">
-						
-					</div>
-				<div class="lefts">
-					<h1>I2P-Bote</h1>
-					<h2>Secure Distributed Email</h2>
-				</div>
-	</div>
-	
-	<div id="topmenu">
-				<div class="rights"></div>
-				<div class="lefts"><ul>
-				<li><a href="index.html" title="Home">HOME</a></li>
-				<li><a href="download.html" title="Download I2P-Bote">DOWNLOAD</a></li>
-				<li><a href="screenshots.html" title="Screenshots">SCREENSHOTS</a></li>
-				<li><a href="userguide.html" title="User Guide">USER GUIDE</a></li>
-				<li><a href="faq.html" title="Frequently Asked Questions">FAQ</a></li>
-				<li><a href="http://forum.i2p/viewforum.php?f=35" title="Forum">FORUM</a></li>
-				<li><a href="contact.html" title="Contact">CONTACT</a></li>
-				
-				</ul></div>
-	</div>
-	
-	<div style="text-align: justify;" id="main">
-		<div id="leftside">
-			<p>
-			<h2>Frequently Asked Questions</h2>
-			</p>
-			<p>
-			<div class="date"></div>
-			</p><p>
-			<strong>What is I2P-Bote?</strong><br/>
-			A peer-to-peer email program designed to protect your privacy.<br/>
-			I2P-Bote is an end-to-end encrypted, network-internal, fully decentralized
-			(serverless) e-mail system. It supports different identities and does
-			not expose e-mail headers. Currently, it is still alpha software and
-			can only by accessed via web console. It soon will have POP3 support,
-			and it is planned to guarantee additional anonymity by providing a
-			high-latency transport option. All bote-mails are automatically
-			end-to-end encrypted, so that there's no need to set up e-mail
-			encryption (though the option does exist), and bote-mails will be
-			authenticated automatically. As
-			it is decentralized, there is no e-mail server that could link
-			different e-mail identities as communicating with each other
-			(profiling): Even the nodes relaying the mails will not know the
-			sender and apart from sender and receiver, only the end of the
-			high-latency mail tunnel and the storing nodes will know to whom
-			(anonymous identity) the mail is destined. The original sender can
-			have gone offline, long before the mail becomes available on the
-			other side. This adds on the degree of anonymity that can be reached
-			with I2P-Bote. For those who do not want high delays: All these
-			settings are be user-adjustable, so each user decides on how much
-			anonymity he wants.
-			</p>
-			<div class="date"></div>
-			
-			<p>
-			<strong>Why is it named I2P-Bote?</strong><br/>
-			Bote is the German word for messenger.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Why I2P-Bote?</strong><br/>
-			Because it's cool.
-			And because I2P was lacking a decentralized e-mail service, and seeing
-			the creation of such as an opportunity to improve on neglected
-			anonymity aspects, it was decided to add an optional high-latency
-			transport. You can use a normal e-mail account and end-to-end encrypt your mails, but
-			they are still not anonymous. You can use anonymous server-bound e-mails, yet they are not automatically
-			end-to-end encrypted.<br>
-			Or you can use I2P-Bote in which your mails
-			are anonymous and <i>automatically</i> end-to-end-encrypted.<br>In contrast
-			to standard e-mail systems there is no need to setup an additional
-			key management application. Everything you need is already there. <br/>But
-			despite it being simple and easy to use, it still offers military
-			grade encryption and options for extremely strong anonymity.
-			</p>
-			<div class="date"></div>
-			
-			<p>
-			<strong>What happens with an email after I click "Send"?</strong><br/>
-			It is encrypted and stored on other I2P-Bote participants' computers. From there, it is delivered to the recipient 				when they check their email.
-			</p>
-			<div class="date"></div>
-			
-			<p>
-			<strong>Wait a minute, all email I send is saved on some random person's hard drive? That sounds like a really dumb 				idea!</strong><br/>
-			All they see is garbage data because it is encrypted with "military-grade" encryption. Only you and the recipient 				know what is in the email. Additionally, if you send the email with relays enabled, it is not even possible to tell 				who sent it.<br/>
-			Between this and using an email account with a 
-			<a href="http://www.theregister.co.uk/2009/12/07/schmidt_on_privacy/">company that doesn't respect your privacy</a>, 				over an internet line that <a href="http://www.eff.org/issues/nsa-spying">is being spied on by shady agencies</a>, 				which would you say is more trustworthy?
-			</p>
-			<div class="date"></div>
-			
-			<p>
-			<strong>How does it work exactly?</strong><br/>
-			&#8211; see the section &#8220;Concept&#8221; of the Manual &#8211;<br/>In short:
-			I2P-Bote nodes form a p2p-network, relaying mail packets for one another and storing them into a DHT.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Why would I use it? I have nothing to hide &hellip;</strong><br/>
-			Because you wouldn't go out to the street naked either, would you?<br/>Well, maybe you would. But the point is, 			sometimes you want private e-mail communication to be secret and untraceable and not let the whole world know when 				you say what to whom.<br/>
-			And sometimes you simply want to communicate fully anonymously with others.<br/>Therefor I2P-Bote is the ideal tool, 				giving you a hell lot of protection while preserving a great deal of flexibility.<br/>
-			It aims at providing professional military grade security and n00b-proof usability:<br/>
-			You can have really paranoid settings, where it takes a mail an eternity to arrive; or have faster communication and 				still enjoy very high anonymity.<br/>
-			You decide &#8211; easily with a click of your mouse.</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>What about <a href="http://www.pgp.com/">PGP</a> and <a href="http://gnupg.org/">GPG</a>?</strong><br/>
-			PGP and GPG let you encrypt email and send it through your existing email account. They offer strong encryption, but 				they only encrypt the email text, not the headers, which means the subject line, your computer name, and other 				information is not secure.<br/>
-			Another privacy issue is that PGP/GPG cannot prevent anybody from finding out who is talking to whom.<br/>
-			I2P-Bote, in contrast, encrypts everything but the recipient's Email Destination. (In fact even the recipient's 			destination is only visible to nodes who do not know who the sender of the mail was.) It also has the ability to 				send an email through several relays (similar to <a href="http://mixmaster.sourceforge.net/">Mixmaster</a>), so 			nobody can find out who is sending email to whom.
-			<br/>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Can I still use GPG/PGP with I2P-Bote?</strong><br/>
-			Of course. Either have GPG encrypt your e-mail's text before pasting it into the I2P-Bote mail composition field, or 				use a mail app with GPG support. [<font color="#ff0000">POP3 support not implemented</font>]
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>How does it compare to Susimail?</strong><br/>
-			I2P-Bote is better because it has a higher version number. Just kidding.<br/>
-			I2P-Bote offers more privacy, but Susimail has some features I2P-Bote doesn't have yet (see below), and Susimail is 				more bandwidth-efficient because it doesn't store emails redundantly.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Why is I2P-Bote better?</strong><br/>
-			<i>We</i> think it's better for <i>us</i> (and maybe for you, too; decide yourself!), than &#8230; <ul><li><p 				style="line-height: 150%;"><font face="Arial, sans-serif">mixminion as it is easy to use and as n00b-proof as we 				could get it.</font></p>
-			</li><li><p style="line-height: 150%;"><font face="Arial, sans-serif">anonymous e-mail services not based on 				destination key routing: as those do not deliver built-in end-to-end encryption.</font></p>
-			</li><li><p style="line-height: 150%;"><font face="Arial, sans-serif">centralized services, as the server could go 				down (due to attacks, legal problems, lack of funding or interest, &#8230;) and the server admin has too many means 				to do profiling.</font></p>
-			</li></ul></p>
-			<div class="date"></div>
-
-			<p>
-			<strong>How is my identity kept safe when I exchange mail with someone?</strong><br/>
-			Never is your ip number or even your I2P-destination included in any e-mail you send.<br/>
-			The high-latency transport counters timing attacks.<br/>
-			End-to-end encryption, per-hop encryption, relaying packets for other nodes, one single packet size* (padding), a 				constant rate of sending (test and dummy messages)*, and a rather balanced incoming/outgoing ratio* counter traffic 				analysis attacks, and in combination with per-hop delays, I2P-Bote offers good means against intersection 				attacks.<br/>
-			The open source nature of I2P-Bote guarantees that you yourself can see the implementation and check it for bugs.
-			<br/>*[<font color="#ff0000">not yet implemented</font>]</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>How do I use it?</strong><br/>
-			Read the manual or see the other questions and answers here!<br>
-			If you still have unanswered questions, ask on the forum: 
-			<a href="http://forum.i2p/viewforum.php?f=35">http://forum.i2p/viewforum.php?f=35</a>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Can I use an email program like Thunderbird?</strong><br/>
-			No, but it is on the roadmap.
-<!--Yes, you can use the e-mail client of your choice, as long as it supports POP3 and SMTP<br/>[<font color="#ff0000">POP3 and SMTP not yet implemented</font>]-->
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Can I send attachments, and what limits are there?</strong><br/>
-			Yes, attachments are supported as of release 0.2.5.<br/>The overall size of attached files should be kept small, 				preferably below 500kB.</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>How do I create an email account?</strong><br/>
-			I2P-Bote calls them Email Identities. You can create one in the I2P-Bote web interface under the "Identities" link. 				The reason why it's not called an account is that there is no provider like GMail or GMX. You alone hold the 				(cryptographic) keys to the Email Identity.<br/>
-			When you create an Email Identity, I2P-Bote generates a string of numbers and letters called an Email Destination. 				This is the address you can be reached at.<br/>
-			Example: <tt><b>wsq-8u5bTWbaOsrS0JuXRKL-RsbTkckV4W7u2mIu0Yrlfetixq1F~03CArnvbd6tDWwjPHYEuoKyWqwxplSdix</b></tt>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>What's an Email Destination? What about email addresses?</strong><br/>
-			Email destinations (aka bote dests) are between 86 and 512 characters long, depending on the type of encryption. 				Support for easy-to-remember, user-chosen addresses is planned for the near future.<br/>
-			The e-mail identities consist of public and private keys, as well as a name the user chooses for it. The public part 				is your e-mail destination, your pseudonymous identity. And one real user can have more than one of those 				identities. They serve for addressing mails to certain users &#8211;therefore it is referred to as a 				&#8220;destination&#8221 or short &#8220;dest&#8221; &#8211; as well as for encrypting the mails for them.
-			Hence, your e-mail destination is the key others use in order to encrypt mails which they send to you, and in
-			order to verify the authenticity and integrity of mails they receive from you.<br/>
-			It is save to give your e-mail destination to anybody you want to get e-mails from.<br/>
-			It is important to distinguish between the mail dest and the router id! Your I2P-Bote mail identity is not related 				to your I2P-Bote router/node id, which is used for I2P-Bote nodes to contact each other and this way for the Bote 				network.<br>
-			If you have problems with your I2P-Bote app &#8211; in the highly unlikely case it should be necessary &#8211; you 				can tell your I2P-Bote router id in irc2p, I2P's IRC channels, or the forum or manually add other peer's id's in 				order to connect, though until now this has never been necessary. <br>It is <b>not linked to your ip</b>. 				Nonetheless, do not relate your I2P-Bote router id with your I2P-Bote mail dests since this might destroy the 				additional anonymity I2P-Bote itself generates!
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Why are the e-mail addresses so long?</strong><br/>
-			In I2P-Bote every mail is (automatically) encrypted. In order not to require you to exchange an e-mail address 				<b>and</b> a long key, we simply made that key the address. This comes with two additional benefits: You won't have
-			to worry if an e-mail address is already taken or not (at least not if you do not send or receive e-mails to or from 				the internet) and you don't need a key management app apart, for taking care of your keys.<br>
-			It is safe to give away this key, as it is only the public key which everybody may know about without compromising 				your e-mails' secrecy.<br/>
-			Using the ECC encryption as option will yield shorter e-mail destination keys.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>But I cannot remember those long destinations &#8230;</strong><br/>
-			That's what the integrated addressbook is there. Once you have become more acquainted qith I2P-Bote, you will 				appreciate the built-in encrpytion and authentication, which can only be achieved using cryptographic keys.
-			<br/>Again, the alternatove would be to have short and easy addresses <b>plus</b> a long key for encryption and 			authentication, <b>and</b> to rely on some authority to map the e-mail addresses to some anonymous recipient.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>What's the point of using multiple mail identities?</strong><br/>
-			I2P-Bote is not an instant messenger, so you can have several identities without having to keep many tunnels open. 				Only for fetching requests you'd use up more resources but at the same time provide more cover for others.<br/>
-			Now, imagine you communicate with your friends unobservedly (see: data retention laws) via I2P-Bote, and want to 				quickly send out a mail that you'll be meeting each other in a different location tonight.
-			Then, you need no super-anonymity and can renounce mail routes and delays. Your friends, on the other hand, would 				want to have a shorter check interval, so they will receive the mail in time. Yet you still want super high 				anonymity for some of your other communications &#8231; that's where a different mail identity with mail routes, 				delays and long check intervals comes in handy.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Which encryption type is best?</strong><br/>
-			256-bit <a href="http://en.wikipedia.org/wiki/Elliptic_curve_cryptography">ECC</a> produces short and handy Email 				Destinations, and it is considered stronger than 2048-bit ElGamal.<br/>
-			521-bit <a href="http://en.wikipedia.org/wiki/Elliptic_curve_cryptography">ECC</a> is stronger than 256-bit ECC, but 				it makes Email Destinations longer.<br/>
-			2048-bit <a href="http://en.wikipedia.org/wiki/ElGamal">ElGamal</a> produces even longer Email Destinations, and it 				is the cryptographically weakest of the three options. However, ElGamal is better researched than ECC, which makes 				it less likely that there is an unknown weakness in ElGamal than in ECC.
-			<br>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>What algorithms are used for symmetric encryption, and for hashing?</strong><br/>
-			<a href="http://en.wikipedia.org/wiki/Advanced_Encryption_Standard">AES-256</a> in
-			<a href="http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29">CBC</a> mode 				and <a href="http://en.wikipedia.org/wiki/SHA-2">SHA-256</a>.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Are there any anti-spam measures?</strong><br/>
-			I2P-Bote does no active spam filtering, but the fact that mass emails have to be sent individually should discourage 				spammers. Another line of defense is <a href="http://www.hashcash.org/">HashCash</a> which is supported at the 				protocol level and may be implemented in a future version if spam becomes a problem.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>How about HTML or styled text?</strong><br/>
-			The webinterface does not render html.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>How long are emails kept around?</strong><br/>
-			Emails are available for 100 days after they have been sent. Emails that have not been downloaded by then are 				deleted.<br/>
-			Emails you have received stay on your local machine until you delete them.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>When do Email Identities expire?</strong><br/>
-			Never.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Can I send email to, and receive email from normal internet email servers?</strong><br/>
-			No, but this is being worked on.
-                        <!-- Yes. You can both send and receive mails to/from ordinary internet e-mail accounts -->
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Can I send email to, and receive email from postman's traditional I2P mail accounts?</strong><br/>
-			No, but this too is being worked on.
-                        <!-- Yes. You can both send and receive mails to/from some_name@mail.i2p addresses -->
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>What does it mean when Know is x'ed for a mail in my inbox?</strong><br/>
-			When the sender's destination is not known locally the mail is marked by an x in the &#8220;Know&#8221; column
-			<!--or by putting &#8220;[UNK]&#8221; before the sender's address in POP3-->.<br/>
-			This means that you have no proof this user is really who he claims to be, in his user name. Of course, if the 				signature is valid, you know he possesses the destination key with which the mail was signed, and that the mail 			content is from that person. But you cannot rely on the short name here. In case you had gotten a mail from a user 				with this name before, you cannot be sure it is the same user this time, even if the signature is valid. In this
-			case you must compare the destination keys or add them to your addressbook. A user not locally known, is not 				necessarily evil, but you shouldn't trust it's the user you might think it is. But, if verified against locally 			stored keys, you know it's the same user when you receive another mail from him and &#8220;Know&#8221; has a green 				check.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>What do &#8220;BktPfx&#8221;, &#8220;Distance&#8221; and &#8220;Locked?&#8221; mean?</strong><br/>
-			&nbsp; &bull; &nbsp; BktPfx = BucketPrefix<br>
-			&nbsp; &bull; &nbsp; Distance: the distance of an I2P-Bote node to your own node in keyspace<br>
-			&nbsp; &bull; &nbsp; Locked: If a node is not reachable for whatever reason, it is marked as locked, plus the time 				it has been found unreachable.<br>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>What can I do to be more anonymous?</strong><br/>
-			<ul>
-			<li><p>Don't send identifying information about you! (name, address, photos, geographic location, time zone, 				age, sex, websites, login names, I2P router id, I2P-Bote id, Files that contain author information about you, 				&#8230;)</p></li>
-			<li><p>don't send personal information or information that only you can possess,</p></li>
-			<li><p>leave I2P-Bote running 24/7,</p></li>
-			<li><p>use mailroutes with randomized per-hop delays and/or per-hop fixed send times, <font color="#ff0000">[not yet 				fully implemented]</font></p></li>
-			<li><p>use a long check interval,</p></li>
-			<li><p>use a long local delay for own packets,</p></li>
-			<li><p>use a big check interval randomization. <span style="color: red;">[not yet implemented]</span></p></li>
-			<li><p>suppress the sending of date and time in the e-mails' header,</p></li>
-			<li><p>suppress translation of markers like &#8220;Re:&#8221; into another language,</p></li>
-			<li><p>watch your language and writing style,</p></li>
-			<li><p>use different e-mail identities,</p></li>
-			<li><p>consider discarding e-mail identities after longer periods of usage,</p></li>
-			<li><p>...</p></li>
-			</ul>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>How do I not send timestamps?</strong><br/>
-			Go to settings and disable sending of timestamps. This will have the effect that your mail will not contain a date 				or time of sending.
-<!-- <br/>(When using mailroutes, the timestamps are automatically disabled.) <span style="color: red;">[not yet implemented]</span></p> -->
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>How do I migrate my settings and data to another computer, or back them up?</strong><br/>
-			I2P-Bote stores all email and other data in the <tt>i2pbote</tt> folder. On Windows, that folder can be found at
-			<tt>%APPDATA%\I2P\i2pbote</tt>; on Linux, it is <tt>$HOME/.i2p/i2pbote</tt>.<br/>
-			To back up or migrate everything, just copy the whole <tt>i2pbote</tt> folder.<br/>
-			If you are only interested in your Email Identities, copy the file <tt>identities.txt</tt>. For the address book, 				copy <tt>addressBook.txt</tt>.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>What is a <i>mail route?</i></strong><br/>
-			see: What does high-latency transport mean?<br/>
-<!-- (When using mail routes, the timestamps are automatically disabled.) [yet to be implemented] -->
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>What does high-latency transport mean?</strong><br/>
-			It means that you can enable an option where e-mail packets are not sent directly to storing nodes, but are relayed 				(forwarded) by other peers (who cannot read the e-mails, as they are encrypted with several layers and ripped into 				small parts), who do not send them on immediately but wait a user-specified time &#8211; in case of sending
-			specified by the sender, in case of receiving specified by recipient.<br/>
-			Therefore it takes the mail some time to arrive. Thus an attacker cannot simply run stats on node uptimes (who was 				connected when) and times a message was received to be stored (which in a low-latency environment would be about the 				time it was sent), in order to uncover the real life identities behind I2P-Bote e-mail identities.
-			</p>			
-			<div class="date"></div>
-
-			<p>
-			<strong>What latencies are there, and how can they be controlled (if at all)?</strong><br/>
-			I2P-Bote is distributed and running on top of the I2P network, so it takes some time. Speed is not our strength, but 				we compare well with other anon mail systems. Without mail routes enabled it takes 3 to 10 minutes from hitting the
-			&#8220;Send&#8221; button to being displayed in the receiver's inbox.<br/>
-			If speed is what you want, fully disable mail routes or set them to the minimum number of hops and minimum per-hop 				delay you can live with.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>If I2P-Bote generates its own anonymity, why does it need I2P?</strong><br/>
-			I2P-Bote is built on top of I2P mainly for five reasons:<br/>
-			&nbsp; &bull; &nbsp; I2P was lacking a decentralized e-mail service and HungryHobo is an I2P user.<br/>
-			&nbsp; &bull; &nbsp; I2P offers very good anonymity, is mature and incorporates years of 				experience.<br>
-			&nbsp; &bull; &nbsp; So being on top of it, kind of represents an anonymity fall-back even if there were some 				crucial bugs in I2P-Bote.<br/>
-			&nbsp; &bull; &nbsp; Flexibility: We want to offer an easy way to anonymous low-latency e-mail communication as 			well, with still a high level of protection.<br/>
-			&nbsp; &bull; &nbsp; I2P with it the many other apps running on top of it creates a lot of traffic that blends with 				I2P-Bote traffic.<br/>
-			&nbsp; &bull; &nbsp; Even I2P-Bote relays are thus location-hidden.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>How anonymous/secure is I2P-Bote without mail routes?</strong><br/>
-			Pretty anonymous and very secure.<br/>
-			It then basically enjoys the same anonymity other apps have on I2P, the anonymity provided by the I2P router &#8211; 				which is rather strong anonymity already. However, I2P is a low-latency network, with all the shortcomings a 
-			low-latency network comes with by its very nature. There are attacks against which I2P cannot protect you or not 				protect you very reliably. I2P-Bote does its best to augment I2P anonymity with its high-latency transport option, 				which make &#8211; if enabled &#8211;
-			I2P-Bote mails <i>paranoidly</i> anonymous.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Is I2P-Bote open source?</strong><br/>
-			Of course!<br/>&#8220; <i>
-			This software is licensed under the GPL version 3 (see licenses/GPLv3.txt), except for bcprov-ecc-jdk16-145.jar 			which is licensed under the Bouncy Castle License 
-			(see licenses/BouncyCastle.txt).</i>&#8221; <br>(Both of which are free open source licences.)
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Who made I2P-Bote?</strong><br/>
-			(See also Credits!)<br>
-			Conception, technical design, implementation and web user interface were/are done by HungryHobo, an anonymous 				developer. For feedback or if you want to offer help, you can contact him using I2P-Bote. His destination key is: 				<br><b>hobo37SEJsEMfQHwcpVlvEgnrERGFz34GC1yjVyuRvl1QHnTi0UAoOtrLP~qkFY0oL59BBqj5sCep0RA8I5G8n</b>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>What languages are available?</strong><br/>
-			English, German, Russian, French, Spanish, Portuguese, Dutch, Norwegian, Swedish, Chinese, and Arabic.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>How can I help translate I2P-Bote into my language?</strong><br/>
-			Translations are done the same way as the rest of I2P. If you would like to help and have questions, please 
-			<a href=contact.html>contact the author.</a>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>How does it work on a technical level?</strong><br/>
-			Have a look at the file <tt>doc/techdoc.txt</tt> in the source code.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>What are some other ways I can help?</strong><br/><br/>
-			&nbsp; &bull; &nbsp; Use I2P-Bote and give feedback<br/><br/>
-                        &nbsp; &bull; &nbsp; Tell your friends, family, collegues et al. about I2P-Bote and lend them a hand<br/><br/>
-                        &nbsp; &bull; &nbsp; Mention I2P-Bote on your blog, eepsite or website<br/><br/>
-			&nbsp; &bull; &nbsp; Write a user's guide or improve the technical documentation<br/><br/>
-			&nbsp; &bull; &nbsp; Add features or fix bugs (<a href=contact.html>contact the author first</a>)<br/><br/>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<br/><br/><br/><br/><br/><br/><br/>
-			<strong>Credits:</strong><br/><br/>
-			Idea &amp; technical concept: <i>HungryHobo</i>, <i>Mixxy</i><br/><br/>
-			Implementation: <i>HungryHobo</i><br/><br/>
-			Plugin support: <i>zzz</i>, <i>HungryHobo</i><br/><br/>
-			User interface: <i>HungryHobo</i><br/><br/>
-			Seedless integration: <i>sponge</i><br/><br/>
-			German translation: <i>HungryHobo</i><br/><br/>
-			Russian translation: <i>suhr</i><br/><br/>
-			French translation: <i>albat</i>, <i>Redzara</i>, <i>Mixxy</i><br/><br/>, <i>magma</i><br/><br/>
-			Spanish translation: <i>Mixxy</i><br/><br/>
-			Portuguese translation: <i>Mixxy</i><br/><br/>
-			Dutch translation: <i>KwukDuck</i><br/><br/>
-			Norwegian translation: <i>hej</i><br/><br/>
-			Swedish translation: <i>hottuna</i><br/><br/>
-			Chinese translation: <i>walking</i><br/><br/>
-			Arabic translation: <i>hamada</i><br/><br/>
-			Alpha testing: <i>HungryHobo</i>, <i>Mixxy</i>, <i>Returning Novice</i>, <i>sponge</i>, and many others<br><br/>
-			Manual: <i>Mixxy</i><br/><br/>
-			<br><br/>
-			</p>
-
-			<div class="date"></div>
-		</div>
-	</div>
-	
-	<div id="footer">
-	<div class="rside">CSS: <a href="http://www.free-css-templates.com" title="Design by David Herreman">David Herreman</a></div>
-	<p>
-	<a href="http://validator.w3.org/check?uri=referer" title="Validate">XHTML</a> - <a href="http://jigsaw.w3.org/css-validator/check/referer" title="Validate">CSS</a>
-	</p>
-	</div>
-</div>
-	
-	
-</body>
-</html>

WebContent/FAQ_fr.html

@@ -1,622 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-	<title>Foire aux questions</title>
-	<meta http-equiv="Content-Language" content="English">
-	<meta name="Robots" content="index,follow">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<link rel="stylesheet" type="text/css" href="FAQ_fr_files/style.html" 
-media="screen">
-</head><body>
-
-<div id="wrap">
-
-	<div id="top">
-				<div class="rights">	</div>
-				<div id="search">
-						
-					</div>
-				<div class="lefts">
-					<h1>I2P-Bote</h1>
-					<h2>Messagerie décentralisée sécurisée</h2>
-				</div>
-	</div>
-	
-	<div id="topmenu">
-				<div class="rights"></div>
-				<div class="lefts"><ul>
-				<li><a 
-href="http://t5qds7twb7eyyvp2fchhbn74tgdzv774rlru5guit5jkn4a6do7a.b32.i2p/index.html"
- title="Home">Accueil</a></li>
-				<li><a 
-href="http://t5qds7twb7eyyvp2fchhbn74tgdzv774rlru5guit5jkn4a6do7a.b32.i2p/download.html"
- title="Download I2P-Bote">Téléchargement</a></li>
-				<li><a 
-href="http://t5qds7twb7eyyvp2fchhbn74tgdzv774rlru5guit5jkn4a6do7a.b32.i2p/screenshots.html"
- title="Screenshots">Captures d'écrans</a></li>
-				<li><a 
-href="http://t5qds7twb7eyyvp2fchhbn74tgdzv774rlru5guit5jkn4a6do7a.b32.i2p/userguide.html"
- title="User Guide">Guide d'utilisation</a></li>
-				<li><a 
-href="http://t5qds7twb7eyyvp2fchhbn74tgdzv774rlru5guit5jkn4a6do7a.b32.i2p/faq.html"
- title="Frequently Asked Questions">Foire aux questions</a></li>
-				<li><a href="http://forum.i2p/viewforum.php?f=35" title="Forum">Forum</a></li>
-				<li><a 
-href="http://t5qds7twb7eyyvp2fchhbn74tgdzv774rlru5guit5jkn4a6do7a.b32.i2p/contact.html"
- title="Contact">Contact</a></li>
-				
-				</ul></div>
-	</div>
-	
-	<div style="text-align: justify;" id="main">
-		<div id="leftside">
-			<p>
-			</p><h2>Foire aux questions</h2>
-			
-			<p>
-			</p><div class="date"></div>
-			<p>
-			<strong>I2P-Bote, kesako?</strong><br>
-			C'est un programme de messagerie P2P conçu pour protéger votre vie privée.<br>
-			I2P-Bote un système de messagerie entièrement décentralisé (sans serveur) 
-                        qui fonctionne sur le réseau I2P.
-			Il prend en charge les identités multiples et n'expose pas les 
-                        en-têtes de messages. Il est encore en phase de développement et n'est 
-                        accessible que via la console du routeur I2P. Il sera bientôt doté de la prise en 
-                        charge de POP3, et de plus d'anonymat via une option de transport 
-			à haute latence. Tous les messages bote sont automatiquement 
-			cryptés de bout en bout sans avoir à régler de cryptage de mails 
-			(bien que cette option soit disponible), et ils sont authentifiés 
-			automatiquement. Comme il est décentralisé, aucun serveur de mail ne peut 
-			faire de rapprochement entre expéditeur et destinataire (profilage):
-			même les nœuds relayant les messages ne peuvent identifier l'expéditeur 
-                        et en dehors de expéditeur et du destinataire, seuls le point terminal du 
-                        tunnel à haute latence et les nœuds de stockage connaissent à qui (l'identité 
-                        anonyme) est destiné le message. L'expéditeur peut se déconnecter bien avant que 
-			le message arrive à destination.
-			Ceci augmente encore le niveau d'anonymat que peut atteindre I2P-Bote. 
-			Pour ceux qui ne veulent pas de forts délais, tous ces paramètre sont 
-			modifiables pour s'adapter au niveau de leur besoin d'anonymat.
-			</p>
-			<div class="date"></div>
-			
-			<p>
-			<strong>Pourquoi ce nom d'I2P-Bote?</strong><br>
-			Bote est le mot allemand pour dire "messager".
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Pourquoi I2P-Bote?</strong><br>
-			Parce que c'est sympa. Et parce qu'un système décentralisé faisait cruellement 
-			défaut et qu'I2P n'avait pas de système de messagerie décentralisé, et qu'y voyant 
-                        une opportunité d'améliorer un aspect négligé des considérations sur l'anonymat, 
-			il fut décidé d'ajouter une méthode de transport à latence élevée.
-			Vous pourriez utiliser un compte de messagerie normal et crypter vos messages, 
-			mais ils ne seraient pas pour autant anonymes. Vous pourriez alors utiliser un serveur 
-			d'envoi anonyme, mais ils ne seraient pas automatiquement cryptés de bout en bout.<br>
-			Ou vous pouvez utiliser I2P-Bote grâce auquel vos messages sont anonymes et 
-			<i>automatiquement</i> cryptés de bout en bout.<br> À la différence des messageries 
-			traditionnelles, il n'y a pas à s'occuper de gérer en plus un système de clés. Tout 
-			ce dont vous avez besoin est déjà prêt.<br> Et ne vous y trompez pas, malgré son 
-			apparente simplicité et sa réelle facilité d'utilisation, I2P-bote vous offre un niveau 
-			de cryptage de qualité militaire et des options d'anonymat extrêmement efficaces.
-			</p>
-			<div class="date"></div>
-			
-			<p>
-			<strong>Que se passe-t-il quand je clique sur "Envoyer"?</strong><br>
-			Le message est crypté et stocké sur des ordinateurs d'autres utilisateurs d'I2P-Bote.
-			À partir de là, il est expédié au destinataire quand il relève son courrier.
-			</p>
-			<div class="date"></div>
-			
-			<p>
-			<strong>Une minute! Tous mes envois sont stockés dans les ordinateurs de personnes 
-			choisies aléatoirement? C'est une idée de fou!</strong><br>
-			Tout ce qu'elles peuvent voir n'est qu'un tas d'ordures car les données sont cryptée 
-			à un niveau militaire. Seuls vous et le destinataire savez ce qu'il y a dans le 
-			message. De plus, si vous envoyez en ayant activé le relayage, il ne leur est même pas 
-			possible de savoir qui l'a envoyé.<br> Entre ça et l'utilisation d'un compte fourni par
-			une <a href="http://www.theregister.co.uk/2009/12/07/schmidt_on_privacy/">société 
-			qui ne respecte pas votre vie privée</a>, sur une liaison Internet qui 
-			<a href="http://www.eff.org/issues/nsa-spying">peut être espionnée par des entités 
-			occultes</a>, quelle est la solution la plus digne de confiance?
-			</p>
-			<div class="date"></div>
-			
-			<p>
-			<strong>Comment cela marche-t-il exactement?</strong><br>
-			– Voyez le chapitre “Concept” du Guide –<br>En bref:
-			Les nœuds I2P-Bote constituent un réseau p2p relayant les paquets de messages 
-			pour le compte des autres et les stockant dans une table de hachage décentralisée (DHT). 
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Pourquoi devrais-je m'en servir? Je n'ai rien à cacher&hellip;</strong><br>
-			Vous vous baladez à poil dans la rue, vous?<br>Bon, après tout c'est possible. Mais il 
-			faut quand même noter qu'il peut parfois vous arriver d'avoir des besoins de correspondances 
-			épistolaires secrètes et intraçables, et ne pas faire savoir au monde entier que vous 
-			dites ceci ou cela et à qui vous le dites.<br>
-			Parfois, vous pouvez aussi vouloir communiquer de façon entièrement anonyme avec 
-			un tiers.<br>I2P-Bote est alors le moyen idéal qui vous donne une protection d'enfer 
-			tout en restant très facile à utiliser.<br>
-			Il parvient à combiner une sécurité de niveau militaire et une ergonomie de niveau 
-			débutant:<br>
-			vous pouvez avoir réglé un niveau d'anonymat paranoïaque, qui retardera l'arrivée du message 
-			d'une demi-éternité, ou avoir des échanges plus rapides et cependant garder un fort 
-			niveau d'anonymat.<br>
-			À vous de décider, d'un simple clic de souris.</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Et au sujet de <a href="http://www.pgp.com/">PGP</a> et 
-			<a href="http://gnupg.org/">GPG</a>?</strong><br>
-			PGP et GPG vous permettent de crypter le courrier et de l'envoyer par votre compte de 
-			messagerie existant. Il offrent du cryptage fort, mais uniquement du corps du message, 
-			pas des en-têtes, ce qui veut dire que les champs "Objet", le nom de votre ordinateur, 
-			et d'autres informations ne sont pas protégées.<br> Une autre faiblesse de PGP/GPG 
-			est qu'ils ne peuvent pas empêcher de trouver qui parle à qui.<br>
-			I2P-Bote, au contraire, crypte tout sauf la destination (en fait, même la destination 
-			n'est visible que par les nœuds qui ignorent de qui vient le message). Il peut aussi 
-			envoyer le message via plusieurs relais (comme 
-			<a href="http://mixmaster.sourceforge.net/">Mixmaster</a>), de sorte que personne ne 
-			puisse trouver qui envoie à qui.<br>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Puis-je toujours utiliser GPG/PGP avec I2P-Bote?</strong><br>
-			Bien sûr. Cryptez le texte de votre message avec GPG avant de le coller dans le corps 
-			du message I2P-Bote, ou utilisez une application de messagerie compatible GPG 
-			[<font color="#ff0000">Prise en charge POP3 non implémentée</font>].
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Quelle différence y a-t-il avec Susimail?</strong><br>
-			I2P-Bote est meilleur parce que son numéro de version est plus élevé&hellip; blague.<br>
-			I2P-Bote apporte plus d'anonymat, mais Susimail dispose de fonctionnalités dont 
-			I2P-Bote est pour l'instant dépourvu (voir plus bas), et Susimail est plus efficace en 
-			terme de consommation de bande passante car il ne fait pas de stockage redondant 
-			réparti.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Pourquoi I2P-Bote est-il meilleur?</strong><br>
-			<i>Nous</i> pensons qu'il est meilleur&hellip; <i>pour nous</i> (et peut-être pour vous, aussi; 
-			décidez vous-même!), que&hellip;</p><ul><li><p style="line-height: 150%;">
-			<font face="Arial, sans-serif">mixminion car il est facile à utiliser et aussi simple à prendre 
-			en main que nous avons pu.</font></p>
-			</li><li><p style="line-height: 150%;"><font face="Arial, sans-serif">les services de mail 
-			anonymes n'utilisant pas le routage basé sur des clés de destination, car ils ne permettent pas 
-			le cryptage de bout en bout.</font></p>
-			</li><li><p style="line-height: 150%;"><font face="Arial, sans-serif">les services centralisés, 
-			car que le serveur pourrait s'arrêter (à cause d'attaques, de problèmes légaux, manque de 
-			financement ou d'intérêt&hellip;) et car l'administrateur du serveur dispose de trop de moyens 
-			pour faire de l'espionnage.</font></p>
-			</li></ul>
-			<div class="date"></div>
-
-			<p>
-			<strong>Comment mon identité est-elle protégée quand j'échange du courrier?</strong><br>
-			Jamais votre adresse IP ni même votre destination I2P n'est inclue dans les messages que vous 
-			envoyez.<br>
-			Les compteurs de transports à haute latence protègent des attaques de timing.<br>
-			Le cryptage de bout en bout et par saut, le relayage des paquets pour d'autres nœuds, les 
-			paquets à taille unique* (bourrage/padding), le débit d'envoi constant (messages de test 
-			et bidons/dummy)*, et un rapport assez équilibré des taux d'envoi/réception* protègent des 
-			attaques d'analyse de trafic, et en combinaison avec les delais par saut, I2P-Bote offre de 
-			bons moyens de prévention des attaques d'intersection.<br>
-			La nature open source d'I2P-Bote garantit que vous pouvez vous-même voir la mise en œuvre et 
-			la vérifier pour y chercher ou trouver des bogues.
-			<br>*[<font color="#ff0000">pas encore implémenté</font>]</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Comment faire pour l'utiliser?</strong><br>
-			Lisez le Guide ou les autres questions/réponses ici!<br>
-			Si vous avez toujours des questions,  posez-les sur le forum: 
-			<a href="http://forum.i2p/viewforum.php?f=35">http://forum.i2p/viewforum.php?f=35</a>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Puis-je utiliser un programme comme Thunderbird?</strong><br>
-			Non, mais c'est sur la feuille de route.
-<!--Yes, you can use the e-mail client of your choice, as long as it supports POP3 and 
-SMTP<br/>[<font color="#ff0000">POP3 and SMTP not yet implemented</font>]-->
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Puis-je envoyer des pièce-jointes, et quelles sont les limites?</strong><br>
-			Oui, depuis la version 0.2.5.<br>La taille cumulée des pièces jointes devrait être petite et de 
-			préférence ne pas dépasser les 500ko.</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Comment créer un compte de messagerie?</strong><br>
-			I2P-Bote les appelle "Identités". Vous pouvez en créer une dans l'interface web d'I2P-Bote 
-			via le lien "Identités". La raison pour laquelle on ne les appelle pas "comptes" est qu'il 
-			n'y a pas de fournisseur comme GMail ou autre. Vous êtes le seul dépositaire du porte-clés 
-			(cryptographique) de l'identité.<br>Quand vous la créez, I2P-bote génère une chaîne de 
-			chiffres et de lettres appelée "Destination". C'est l'adresse à laquelle on peut vous joindre. 
-			<br>
-Exemple: <tt><b>wsq-8u5bTWbaOsrS0JuXRKL-RsbTkckV4W7u2mIu0Yrlfetixq1F~03CArnvbd6tDWwjPHYEuoKyWqwxplSdix</b></tt>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Qu'est-ce qu'une destination? Et l'adresse mail?</strong><br>
-			La longueur des destinations est comprise entre 86 et 512 caractères, suivant le type de 
-			cryptage. La prise en charge d'adresses faciles à mémoriser et choisies par l'utilisateur est 
-			au programme d'un futur proche.<br>Les identités sont une paire de clés privée et publique, 
-			et d'un nom que l'utilisateur lui attribue. La clé publique est la destination, 
-			votre identité pseudonymique. Un utilisateur réel peut en avoir plusieurs. Elles servent à 
-			envoyer des messages à certains utilisateurs – donc aussi appelés “destinations” – tout comme 
-			pour crypter les messages qui leur sont&hellip; destinés. Votre destination est donc pour les 
-			autres aussi la clé qu'ils utilisent pour crypter les messages qu'ils vous envoient et pour 
-			pour vérifier l'intégrité et l'authenticité de ceux qu'ils reçoivent&hellip; de vous.<br>
-			Il est sans danger (et indispensable) de donner votre destination à toute personne de laquelle 
-			vous voulez recevoir du courrier.<br>Il est important de faire la distinction entre votre 
-			destination de messagerie et la destination de votre routeur I2P! Votre identité de messagerie 
-			n'a rien à voir avec l'identité de votre nœud/routeur I2P-Bote qui est utilisée pour permettre 
-			aux nœuds I2P-Bote de se contacter les uns les autres pour constituer le réseau Bote.<br>
-			Si vous avez des problèmes avec l'application I2P-Bote – dans le cas très improbable où ça 
-			serait nécessaire – vous pouvez indiquer votre destination (au sens d'application I2P) sur 
-			irc2p, les canaux IRC ou le forum I2P, ou ajouter manuellement des identités d'autres pairs 
-			pour pouvoir vous connecter, bien que ceci n'ait jamais été nécessaire à ce jour.<br>
-			Elle <b>n'est pas liée à votre adresse IP</b>. Néanmoins, ne révélez d'aucune façon la relation 
-			entre votre identité de routeur I2P-Bote et celle d'une de vos propres destinations de courrier 
-			I2P-Bote car cela réduirait à néant le niveau d'anonymat supplémentaire qu'I2P-Bote porte en 
-			lui-même!
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Pourquoi les adresses sont-elles si longues?</strong><br>
-			Dans I2P-Bote chaque message est (automatiquement) crypté. Pour vous éviter d'avoir à échanger 
-			votre adresse <b>ET</b> de très longues clés publiques, on a simplement fait de ces clés les 
-			adresses. Deux autres avantages en découlent: vous n'avez pas à vous soucier de la préexistence 
-			de votre adresse (au moins tant que vous ne recevez ni n'envoyez courrier vers 
-			l'Internet normal), et vous n'avez pas à avoir un système de gestion de clés séparé pour 
-			s'occuper de vos clés.<br>
-			Il est sans danger (et indispensable) de donner cette clé, car elle n'est que la clé publique, 
-			que certains peuvent avoir à connaître, sans pour autant que cela compromette la 
-			confidentialité de vos messages.<br>
-			L'utilisation du cryptage ECC conduit à des clés plus courtes.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Mais je n'arrive pas à mémoriser de si longues destinations&hellip;</strong><br>
-			Le carnet d'adresses est là pour ça. Une fois convaincu par le principe d'I2P-Bote, vous 
-			apprécierez le cryptage et l'authentification intégrés, qui ne peuvent être atteints que par 
-			l'utilisation de clés cryptographiques.
-			<br>Encore une fois, l'alternative serait d'avoir des adresses courtes et simples <b>plus</b> 
-			de longues clés de cryptage et authentification, <b>ET</b> de se reposer sur quelqu'autorité 
-			pour faire la relation entre l'adresse et un destinataire anonyme.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Quel est l'intérêt d'utiliser de multiples identités?</strong><br>
-			I2P-Bote n'est pas une messagerie instantanée, donc vous pouvez avoir plusieurs identités sans 
-			avoir à tenir plusieurs tunnels ouverts en même temps. Vous utiliserez seulement un peu plus de 
-			ressources au moment de la relève mais en même temps vous fournirez une meilleure couverture 
-			aux autres.<br>
-			Maintenant, imaginez que vous communiquez incognito avec des amis (voir: lois sur le stockage 
-			de données) via I2P-Bote, et que vous voulez envoyer rapidement un message pour vous retrouver 
-			ce soir ailleurs qu'à l'habituel Café des Arts. Vous n'avez pas besoin d'un super-anonymat et 
-			pouvez renoncer aux relayages et délais de mails. Vos amis, d'autre part, devraient raccourcir 
-			leur intervalle de vérification pour recevoir le message à temps. Mais pour d'autres types de 
-			communications, vous avez besoin d'un super niveau d'anonymat, <!--et c'est là qu'une autre 
-			identité avec un relayage et des délais différents peut être utile-->
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Quel est le meilleur cryptage?</strong><br>
-			<a href="http://fr.wikipedia.org/wiki/Cryptographie_sur_les_courbes_elliptiques">ECC</a> à 256 
-			bits produit des adresses destinations courtes et maniables, et est considéré comme plus solide 
-			que l'ElGamal à 2048 bits.<br>
-			<a href="http://en.wikipedia.org/wiki/Elliptic_curve_cryptography">ECC</a> à 521 bits est plus 
-			solide que sa version à 256 bits, mais il génère des destinations (clés) très longues.<br>
-			<a href="http://fr.wikipedia.org/wiki/Cryptosyst%C3%A8me_de_ElGamal">ElGamal</a> à 2048 bits 
-			génère des clés encore plus longues, et il est le plus faible des trois algorithmes. Cependant, 
-			ElGamal fait l'objet de plus recherches que ECC, ce qui rend moins probable qu'une faiblesse de 
-			cet algorithme passe inaperçue pendant plus longtemps que dans ECC.<br>
-			</p>
-			<div class="date"></div>
-
-			<p>
-		    <strong>Quels algorithmes sont-ils utilisés pour le cryptage symétrique et le hachage?</strong><br>
-			<a href="http://fr.wikipedia.org/wiki/Advanced_Encryption_Standard_process">AES</a>-
-			<a href="http://fr.wikipedia.org/wiki/Advanced_Encryption_Standard">256</a> en mode 
-<a href="http://fr.wikipedia.org/wiki/Mode_d%27op%C3%A9ration_%28cryptographie%29#Encha.C3.AEnement_des_blocs_:_.C2.AB_
-Cipher_Block_Chaining_.C2.BB_.28CBC.29">CBC</a> et 
-			<a href="http://http://fr.wikipedia.org/wiki/Secure_Hash_Algorithm">SHA-256</a>.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Y a-t-il des protections anti-spam?</strong><br>
-			I2P-Bote ne filtre pas le spam, mais le fait que l'envoi en masse doive être fait 
-			individuellement devrait décourager les spammers. Un autre moyen de défense repose sur des 
-			pénalités (<a href="http://www.hashcash.org/">HashCash</a>) qui sont un mécanisme supporté au 
-			niveau du protocole, et qui pourrait être implémenté dans une version ultérieure si le spam 
-			devenait un problème.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Deux mot sur HTML et le formatage de texte?</strong><br>
-			L'interface web ne restitue pas la mise en forme HTML.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Pendant combien de temps les messages restent-ils dans la nature?</strong><br>
-			Ils restent disponibles 100 jours après l'émission. Les messages n'ayant pas été relevés 
-			au-delà de cette période sont supprimés.<br>
-			Les messages relevés restent sur votre ordinateur jusqu'à ce que vous les supprimiez.</p>
-			<div class="date"></div>
-			<p>
-			<strong>Quand les identités expirent-elle?</strong><br>
-			Jamais. Mais la votre peut devenir inutilisable si vous perdez le contenu de votre disque dur. 
-			Vous seriez alors amené à en créer une ou plusieurs autres en remplacement, et en informer vos 
-			correspondants habituels.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Puis-je recevoir et envoyer des messages de/vers des serveurs de l'Internet normal?
-					</strong><br>
-			Non, mais on y travaille.
-                   <!-- Yes. You can both send and receive mails to/from ordinary internet e-mail accounts -->
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Et de/vers les comptes traditionnels de postman?</strong><br>
-			Non plus, mais on y travaille aussi.
-                        <!-- Yes. You can both send and receive mails to/from some_name@mail.i2p addresses -->
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Que signifient les icônes dans la colonne "Connu" de la boîte de réception?</strong><br>
-			Quand la destination expéditrice est inconnue localement le message est marqué d'un X dans la 
-			colonne "Connu"
-			<!--or by putting &#8220;[UNK]&#8221; before the sender's address in POP3-->.<br>
-			Cela veut dire que vous n'avez aucune preuve que cet utilisateur est vraiment qui il prétend 
-			être dans son nom public "humain". Bien sûr, si la signature est valide, vous êtes assuré(e) 
-			qu'il possède la clé privée de destination avec laquelle il a signé le message, et donc que le 
-			contenu du message est bien issu de cette personne. Mais vous ne pouvez pas vous fier au nom 
-			court malgré tout (il vous faudrait un autre moyen de vous en assurer: qu'il vous ait remis sa 
-			destination en main propre par exemple, ou vérifiée au téléphone, etc&hellip;). Dans le cas où 
-			vous avez déjà eu un message d'un utilisateur affichant ce nom, vous ne pouvez pas être sûr(e) 
-			que c'est le même utilisateur cette fois, même si la signature est valide. Dans ce cas, vous 
-			devez comparer les clés de destination ou les ajouter à votre carnet d'adresses. Un utilisateur 
-			inconnu localement n'est pas forcément une vermine, mais vous ne devriez pas lui faire 
-			confiance à priori sur la seule foi du nom qu'il annonce. Mais s'il passe avec succès le test de
-			comparaison avec la clé précédemment par vous stockée localement, vous avez au moins la preuve 
-			qu'il s'agit bien du même utilisateur quand vous recevez un nouveau message de sa part, et la 
-			colonne "Connu" est maintenant décorée d'une jolie coche verte.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>“BktPfx”, “Distance” et “Verrouillé?"&hellips; c'est quoi?</strong><br>
-			&nbsp; • &nbsp; BktPfx = BucketPrefix (préfixe de paquet)<br>
-			&nbsp; • &nbsp; Distance: la distance d'un nœud I2P-Bote au votre propre dans l'espace de clés. 
-														<br>
-			&nbsp; • &nbsp; Verrouillé: si un nœud n'est pas joignable, quelle qu'en soit la raison, il est 
-			marqué "Verrouillé", et le temps depuis lequel sa défection a été découverte est affiché.<br>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Comment rester plus anonyme?</strong><br>
-			</p><ul>
-			<li><p>N'envoyez aucune information à votre sujet! (nom, adresse, photos, situation 
-			géographique, fuseau horaire, âge, sexe, sites web, identifiants, id de routeur I2P, id 
-			I2P-Bote, fichiers contenant des informations sur l'auteur, &hellip;)</p></li>
-			<li><p>N'envoyez pas d'information personnelles c'est à dire des informations qui vous 
-			identifient de façon unique en tant que vous seul les connaissez,</p></li>
-			<li><p>Laissez I2P-Bote tourner 24/24 7/7,</p></li>
-			<li><p>Utilisez des routes de messages avec des délais aléatoires par-saut et/ou des temps 
-			fixes par saut <font color="#ff0000">[not yet fully implemented]</font>,</p></li>
-			<li><p>Utilisez de longs intervalles de relève,</p></li>
-			<li><p>Utilisez un délais long pour vos propres paquets,</p></li>
-			<li><p>Utilisez un fort niveau d'intervalle de relève aléatoire. <span style="color: 
-				red;">[not yet implemented]</span></p></li>
-			<li><p>Supprimez l'envoi de la date et de l'heure dans les en-têtes de messages,</p></li>
-			<li><p>Renoncez aux marqueurs de suivi tels que “Tr:” traduits dans votre langue,</p></li>
-			<li><p>Surveillez votre style de langage et d'écriture,</p></li>
-			<li><p>Utilisez différentes identités,</p></li>
-			<li><p>Envisagez d'abandonner vos identités après de longues périodes d'utilisation,</p></li>
-			<li><p>...</p></li>
-			<li><p>Cette liste n'est pas destinée à vous rendre paranoïaque, mais à vous montrer par où 
-			l'anonymat peut-être amoindri.</p></li>
-			</ul>
-			
-			<div class="date"></div>
-
-			<p>
-			<strong>Comment ne pas envoyer de tampons horaires?</strong><br>
-			L'option est dans les "Préférences". Les messages n'auront pas de date/heure d'envoi;
-<!-- <br/>(When using mailroutes, the timestamps are automatically disabled.) 
-<span style="color: red;">[not yet implemented]</span></p> -->
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Comment migrer mes réglages et données vers un autre ordinateur, ou les 
-			sauvegarder?</strong><br>
-			I2P-Bote stocke tout le courrier et autres données dans le dossier <tt>i2pbote</tt>. Sur 
-			Windows, <tt>%APPDATA%\I2P\i2pbote</tt>; sur Linux, <tt>$HOME/.i2p/i2pbote</tt>.<br>
-			Une simple copie du dossier <tt>i2pbote</tt> fait l'affaire.<br>
-			Si seules vos identités vous intéressent, copiez le fichier <tt>identities.txt</tt>.
-			Pour le carnet d'adresses, copiez <tt>addressBook.txt</tt>.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>qu'est-ce qu'une <i>route de messages</i>?</strong><br>
-			voir: Que signifie "Transport à haute latence"?<br>
-<!-- (When using mail routes, the timestamps are automatically disabled.) [yet to be implemented] -->
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Que signifie "Transport à haute latence"?</strong><br>
-			Cela signifie que (par une option que vous pouvez activer) les paquets de messages ne sont pas 
-			envoyés directement aux nœuds de stockage, mais sont relayés (transférés) par d'autres pairs 
-			(qui ne peuvent pas les lire  car ils sont cryptés sur plusieurs niveaux et découpés en petits 
-			morceaux) qui ne les traitent pas immédiatement mais attendent un certain temps défini au 
-			niveau utilisateur – pour l'envoi, par l'expéditeur, pour la réception, par le destinataire.<br>
-			En conséquence le message est long à arriver. L'attaquant ne peut pas utiliser de statistiques 
-			sur les temps de fonctionnement des nœuds (qui s'est connecté à quel moment) ni les moments où 
-			un message a été reçu pour être stocké (ce dans un environnement à faible latence serait à peu 
-			près le moment où il a été envoyé), pour en déduire les identités réelles sous-jacentes aux 
-			identités I2P-Bote.
-			</p>			
-			<div class="date"></div>
-
-			<p>
-			<strong>Quelles latences y a-t-il, et comment les contrôler?</strong><br>
-			I2P-Bote est décentralisé et s'exécute sur le reéseau I2P, donc ça prend du temps. La vitesse 
-			n'est pas notre force, mais il supporte bien la comparaison à d'autres systèmes de messagerie 
-			anonyme. Sans apport des routes de messages, il faut 3 à 10 mn entre le clic sur "Envoyer" et 
-			l'affichage chez le destinataire.<br>Si la vitesse vous préoccupe, désactivez les routes ou 
-			réglez-les au nombre de sauts et de retard par saut minimums avec lesquels vous pouvez vivre.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Si I2P-Bote son propre anonymat, pourquoi a-t-il besoin d'I2P?</strong><br>
-			I2P-Bote est bâti sur I2P pour cinq raisons principales:<br>
-			&nbsp; • &nbsp; I2P manquait d'une messagerie décentralisée et HungryHobo est un utilisateur 
-			d'I2P.<br>
-			&nbsp; • &nbsp; I2P offre un excellent anonymat, il est bien au point et bénéficie de 
-			nombreuses années d'expérience.<br>
-			&nbsp; • &nbsp; Donc, en faire ses fondations représente une assurance d'anonymat s'il y avait 
-			des bogues critiques dans I2P-Bote.<br>
-			&nbsp; • &nbsp; Souplesse: nous voulons aussi offrir une méthode de communication à faible 
-			latence, tout en gardant un haut niveau de protection.<br>
-			&nbsp; • &nbsp; I2P, avec toutes les autres applications qui l'utilisent, génère beaucoup de 
-			trafic dans lequel le trafic I2P-Bote peut se camoufler.<br>
-			&nbsp; • &nbsp; En conséquence, même les relais I2P-Bote sont masqués en terme de localisation.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Que valent l'anonymat et la sécurité d'I2P-Bote sans les routes?</strong><br>
-			Plutôt bonne pour l'anonymat et très sécurisé.<br>
-			Il bénéficie de base du même anonymat que les autres applications I2P, l'anonymat procuré par 
-			le routeur 2P router – qui est déjà fort conséquent. Cependant, I2P est un réseau à faible 
-			latence, avec tous les défauts intrinsèques de ce genre de réseaux. Il a des attaques contre 
-			lesquelles I2P ne peut pas vous protéger ou au moins très efficacement. I2P-Bote améliore 
-			l'anonymat grâce à ses options de transport à haute latence, qui rendent – si vous les 
-			activez – les messages I2P-Bote à un niveau d'anonymat <i>paranoïaque</i>.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>I2P-Bote, open source?</strong><br>
-			Bien sûr!<br>“ <i>Ce logiciel est sous licence GPL version 3 (voir licenses/GPLv3.txt), 
-			sauf pour bcprov-ecc-jdk16-145.jar qui est sous licence Bouncy Castle (voir 
-			licenses/BouncyCastle.txt).</i>” <br>(Toutes deux sont des licences libres et ouvertes).
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Qui a créé I2P-Bote?</strong><br>
-			(Voir aussi les "Remerciements"!)<br>
-			La conception, la structure technique, l'implémentation et l'interface web user sont de 
-			HungryHobo, un développeur anonyme. Pour les retours techniques ou proposer votre aide, vous 
-			pouvez le contacter avec I2P-Bote. Sa destination est: <br>
-			<b>hobo37SEJsEMfQHwcpVlvEgnrERGFz34GC1yjVyuRvl1QHnTi0UAoOtrLP~qkFY0oL59BBqj5sCep0RA8I5G8n</b>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Langues disponibles</strong><br>
-			Anglais, allemand, russe, français, espagnol, portugais, hollandais, norvégien, suédois, 
-			chinois et arabe.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Comment puis-je aider à la traduction d'I2P-Bote dans ma langue?</strong><br>
-			Comme pour I2P.   
-			<a href="http://t5qds7twb7eyyvp2fchhbn74tgdzv774rlru5guit5jkn4a6do7a.b32.i2p/contact.html"> 
-			Contactez l'auteur.</a>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>Fonctionnement technique?</strong><br>
-			Regardez <tt>doc/techdoc.txt</tt> dans le code source.
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<strong>D'autres moyens pour aider?</strong><br><br>
-			&nbsp; • &nbsp; Utilisez I2P-Bote et faites part de vos commentaires/<br><br>
-                        &nbsp; • &nbsp; Parlez d'I2P-Bote à vos amis, à votre famille et à vos collègues, et aidez-les.
-			<br><br>
-                        &nbsp; • &nbsp; Mentionnez I2P-Bote sur votre blog, votre eepsite et votre web.<br><br>
-			&nbsp; • &nbsp; Rédigez un guide utilisateur ou améliorez la documentation technique.<br><br>
-			&nbsp; • &nbsp; Ajoutez des fonctionnalités ou corrigez des bogues (<a 
-href="http://t5qds7twb7eyyvp2fchhbn74tgdzv774rlru5guit5jkn4a6do7a.b32.i2p/contact.html">contactez tout d'abord l'auteur
-			</a>).<br><br>
-			</p>
-			<div class="date"></div>
-
-			<p>
-			<br><br><br><br><br><br><br>
-			<strong>Remerciements:</strong><br><br>
-			Idée &amp; conception technique: <i>HungryHobo</i>, <i>Mixxy</i><br><br>
-			Implémentation: <i>HungryHobo</i><br><br>
-			Maintenance du greffon: <i>zzz</i>, <i>HungryHobo</i><br><br>
-			Interface utilisateur: <i>HungryHobo</i><br><br>
-			Intégration de Seedless: <i>sponge</i><br><br>
-			Traduction allemande: <i>HungryHobo</i><br><br>
-			Traduction russe: <i>suhr</i><br><br>
-			Traduction française: <i>albat</i>, <i>Redzara</i>, <i>Mixxy</i>, <i>magma</i><br><br>
-			Traduction espagnole: <i>Mixxy</i><br><br>
-			Traduction portugaise: <i>Mixxy</i><br><br>
-			Traduction hollandaise: <i>KwukDuck</i><br><br>
-			Traduction norvégienne: <i>hej</i><br><br>
-			Traduction suédoise: <i>hottuna</i><br><br>
-			Traduction chinoise: <i>walking</i><br><br>
-			Traduction arabe: <i>hamada</i><br><br>
-			Testeurs versions Alpha: <i>HungryHobo</i>, <i>Mixxy</i>, <i>Returning Novice</i>,
- <i>sponge</i>, et de nombreux autres<br><br>
-			Manuel: <i>Mixxy</i><br><br>
-			<br><br>
-			</p>
-
-			<div class="date"></div>
-		</div>
-	</div>
-	
-	<div id="footer">
-	<div class="rside">CSS: <a href="http://www.free-css-templates.com/" 
-title="Design by David Herreman">David Herreman</a></div>
-	<p>
-	<a href="http://validator.w3.org/check?uri=referer" title="Validate">XHTML</a>
- - <a href="http://jigsaw.w3.org/css-validator/check/referer" 
-title="Validate">CSS</a>
-	</p>
-	</div>
-</div>
-	
-	
-</body></html>

WebContent/User's Guide.html

@@ -1,879 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head>
-<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>User's Guide</title><meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8"><meta name="GENERATOR" content="OpenOffice.org 3.2  (Unix)"><style type="text/css">
-	<!--
-		@page { margin: 2cm }
-		P { margin-bottom: 0.21cm }
-		A:link { so-language: zxx }
-	-->
-	</style><meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8"><meta name="GENERATOR" content="OpenOffice.org 3.2  (Unix)"><style type="text/css">
-	<!--
-		@page { margin: 2cm }
-		P { margin-bottom: 0.21cm }
-	-->
-	</style></head><body>
-
-
-	
-	
-	
-	
-
-<p style="line-height: 150%; font-weight: bold;" align="center"><font face="Arial, sans-serif">I2P-Bote
-Manual</font></p>
-<p style="line-height: 150%;"><br></p>
-<p style="line-height: 150%;"><br>
-</p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><b>1.
-Introduction</b></font></p>
-
-<p style="line-height: 150%;"><br><br>
-<font face="Arial, sans-serif">I2P-Bote
-is an easy-to-use, highly anonymous secure e-mail application for
-I2P. It is a serverless, fully decentralized system that
-establishes/forms a peer-to-peer network built on top of
-state-of-the-art low latency anonymizing network I2P; adding to it an
-optional mixminion-like high-latency transport and thus avoiding the
-shortcomings of low-latency networks.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Therefore,
-I2P-Bote makes full use of the anonymity provided by I2P, plus it
-generates its own anonymity by adding another anonymizing layer
-(overlay network).</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">This
-concept of layered anonymity is what makes I2P-Bote so flexible:</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">You can
-configure it to be extremely anonymous and slow or less anonymous but
-faster/more efficient. In any event, I2P-Bote<font color="#000000">
-always provides a very good anonymity for both, sender and receiver,
-as well as end-to-end encryption*. </font></font>
-</p>
-<p style="line-height: 150%;"><font color="#000000"><font face="Arial, sans-serif">I2P-Bote
-offers the option to make your communications even more anonymous, by
-enabling the high-latency mail routes &#8211; at cost of performance,
-however. Users that want their anonymous e-mails to arrive as quickly
-as possible, will want to disable the mail routes and use 'direct'
-sending through I2P. It is guaranteed that you will never be less
-anonymous than the anonymity provided by standard I2P connections. </font></font>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><font color="#000000">In
-order to achieve high usability, we have enabled it to be used with
-standard mail clients such as Thunderbird, Evolution or Kmail,
-without having to worry about what extra information these
-applications send in their headers. [</font><font color="#ff0000">YET
-TO BE IMPLEMENTED</font><font color="#000000">] Furthermore there is
-a web interface that lets you send and read e-mails or manage your
-settings and identities.</font></font></p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">I2P-Bote
-is easy to use: If you're
-not yet using I2P, just install I2P from <a href="http://www.i2p2.de/">http://www.i2p2.de</a>
-and then install the I2P-Bote plugin as described in this manual.
-Otherwise simply read on!**</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><i>Current
-version is 0.2.6.</i></font><br><br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">*Unless
-you send e-mails to or receive them from the regular internet, ALL
-emails &#8211; the mail body, attachments and the header except
-recipient's address (subject, date, time, sender address, ...) are
-automatically and transparently end-to-end encrypted. The recipient's
-address is only visible for the mail route's last node that stores
-the packets into the kad network, and the respective storing nodes,
-but they cannot read the mail's content nor who sent it nor who will
-fetch it.</font></p>
-<p style="line-height: 150%;"><br><br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">**Of
-course you can also compile from source.</font></p>
-<p style="line-height: 150%;"><br>
-</p>
-<p style="line-height: 150%;"><br>
-<br>
-</p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><b>2.
-Howto</b></font></p>
-<p style="line-height: 150%;"><br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><u>2.1.
-Installation</u></font></p>
-<p style="line-height: 150%;"><br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">In order
-to install I2P-Bote, go to the bottom of the I2P Client Configuration
-page at </font>
-</p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><a href="http://localhost:7657/configclients.jsp">http://localhost:7657/configclients.jsp</a>
-</font>
-</p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">and
-enter:</font></p>
-
-<p style="line-height: 150%;"><a href="http://tjgidoycrw6s3guetge3kvrvynppqjmvqsosmtbmgqasa6vmsf6a.b32.i2p/i2pbote.xpi2p"><font face="Arial, sans-serif">http://tjgidoycrw6s3guetge3kvrvynppqjmvqsosmtbmgqasa6vmsf6a.b32.i2p/i2pbote.xpi2p</font></a></p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">(
-<a href="http://i2pbote.i2p/i2pbote.xpi2p">http://i2pbote.i2p/i2pbote.xpi2p</a>
-might work, too, if you have i2pbote.i2p in your address book or a
-subscription )</font></p>
-
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">in the
-&#8220;Plugin Installation Download Url&#8221; line, then hit &#8220;Install
-Plugin&#8221;. Wait
-until your sidebar says plugin installed and started. </font>
-</p>
-<p style="line-height: 150%;"><br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">In order
-to update your I2P-Bote instance, click 'Update' under I2P-Bote on
-the I2P Client Configuration page at
-<a href="http://localhost:7657/configclients.jsp">http://localhost:7657/configclients.jsp</a></font></p>
-
-<p style="line-height: 150%;"><br><br>
-</p><p style="line-height: 150%;"><font face="Arial, sans-serif"><u>2.2.
-Using I2P-Bote</u></font></p>
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif">On your
-router console <a href="http://127.0.0.1:7657/">http://127.0.0.1:7657/</a>
-click on <span style="font-style: italic;">SecureMail</span> on the upper left (in the sidebar). Now you are
-on I2P-Bote's web interface.</font></p>
-
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">After
-starting I2P-Bote (by default it is set to start automatically when
-your I2P router starts up) it takes a bit more than three minutes for
-everything to be up and running. </font>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">So have a
-look at 'Network Status' on the left. It should state 'Connected'.</font></p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">If you
-want to use I2P-Bote for yourself, you first need to create an
-identity.</font>
-</p>
-
-
-<p style="line-height: 150%;"><br><br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><u>2.2.1
-Creating an Identity</u></font></p>
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif">Click on
-'Identities' on the left, then hit the &#8220;New Identity&#8221; button.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Enter at
-least a 'Public Name' and hit 'Create'. That's all that's needed to
-create an identity.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">The
-public name is the name you see for this identity (useful in case you
-have different identities for different sets of users you communicate
-with or different purposes) and it will be sent as &#8220;sender's name&#8221;
-to the mail's recipient. There is no need for Public Name to be
-unique. </font>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">(As you
-can choose any name here &#8211; anyone could call himself HungryHobo
-there &#8211; it is not suited to be used by the recipient for telling if
-two mails come from the same sender. This is why the name saved in
-the local addressbook (there can only by one name per destination
-key) is displayed, if there is any, and you will see a green mark in
-the &#8220;Know&#8221; column, stating it is the locally known name. If there
-is no entry for a destination in local addressbook, the name
-specified by the sender will be displayed with a prefixed [UNK] in
-the mail clients). [<font color="#ff0000">POP3 NOT YET IMPLEMENTED</font>]</font></p>
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif">You can
-also fill out the other fields, if you like:</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Description
-&#8211; this field is kept locally. It's just for your convenience: If
-you want to add some additional information for yourself about that
-identity, you can enter it here. </font>
-</p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Email
-Address &#8211; this field is not used yet.<font color="#ff0000"><br></font></font><br><font color="#000000"><font face="Arial, sans-serif">Choose
-from one of the given encryption algorithms. If in doubt, stick to
-the defaults.</font></font></p>
-
-
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">You click
-on the name of one of your identities and copy the long key displayed
-under 'Email Destination'. This is your I2P-Bote e-mail address. If
-you want anybody to be able to send you a bote mail, he need to be
-given this long key.</font><br>
-<br><font face="Arial, sans-serif">Now you
-can send and receive I2P-Bote mails.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">But you
-should also have a look at your I2P-Bote settings and see if they fit
-your needs.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">(You can
-also create various identities and assign different settings to each
-of them.)</font></p>
-<p style="line-height: 150%;"><br></p><p style="line-height: 150%;"><font face="Arial, sans-serif"><u><br>
-2.2.2
-Sending and Receiving E-Mails</u></font></p>
-<p style="line-height: 150%;"><br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">You need
-to have the I2P-Bote e-mail destination key of the user you to whom
-you want to send a bote mail. </font>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">In order
-to send a message, click on 'New', choose your own sender identity or
-'Anonymous' under &#8220;From&#8221; and enter the recipient's e-mail
-destination key or alternatively an address in the &#8220;To:&#8221;  line.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Alternatively,
-you can hit the &#8220;Addr. Book&#8221; button right under this very line,
-in order to chose from e-mail dests stored locally in your address
-book: Mark the user(s) to which you want your mail to be sent and hit
-the &#8220;Add Recipients&#8221; button.)</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">You can
-add several recipients and change the 'To:' to 'CC:' or 'BCC:'.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">The &#8220;+&#8221;
-button adds additional recipient lines.</font></p>
-<p style="line-height: 150%;"><br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Now write
-your bote mail and hit 'Send' for sending it, or 'Save' in order to
-store it as a draft into your 'drafts' folder or any user-defined
-folder. [<font color="#ff0000">not yet implemented</font>]</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Hitting
-&#8220;Send&#8221; will place your e-mail into the Outbox folder and you can
-go on using I2P-Bote, e.g. writing another e-mail, or simply do other
-things. I2P-Bote is now sending your e-mail. Once it is sent, it's
-automatically removed from Outbox and stored into your Sent folder.
-This means, your mail is entirely on the way to its destination
-(unless you have set a delay time, which is disabled by default).</font></p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">In
-I2P-Bote e-mails are automatically signed (unless send without any
-sender identity).<br>
-You can
-also send e-mails without specifying <i>any </i><span style="font-style: normal;">sender
-identity/destination/address, just select &#8220;Anonymous&#8221; in the
-scroll-down menu &#8220;From:&#8221;.</span></font></p>
-
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif">In the
-default settings I2P-Bote will automatically check for new mails, and
-all you need to do in order to see if you got e-mails is look into
-your Inbox (link 'Inbox' on the left).<br>
-You can
-force a manual check by clicking the 'Check Mail' button. This is a
-global checking, that tries to fetch new mails for all of your
-identities, except for those you have excluded from global checking.
-[<font color="#ff0000">not yet implemented</font>]</font></p>
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif">The
-number of unread e-mails is shown in parenthesis next to the folder's
-name in the sidebar. </font>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Click on
-&#8220;<span style="font-style: normal;">Inbox&#8221;</span> to have a list of
-received e-mails displayed. You will see two columns with x's or
-green checks. Those show you if a mail contains a valid signature and
-is thus authentic (Sig) and if the sender's e-mail destination key is
-locally known, i.e. in your addressbook (Know). Hence, two green
-checks next to a mail entry mean that you already know that e-mail
-identity and that the mail is signed by that identity. </font>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">If you
-have a certain name in your address book and you get a mail from an
-identity with that name, yet Know is <i><u>not</u></i><i> </i><span style="font-style: normal;">displaying
-a green check, then it is a </span><i><u>different</u></i><span style="font-style: normal;">
-destination that sent and signed this mail; he simply has chosen the
-same name you have chosen for one of your contacts.</span></font></p>
-<p style="font-style: normal; line-height: 150%;"><font face="Arial, sans-serif">Is
-there a green check mark for &#8220;Sig&#8221;, then the mail is correctly
-signed by the sender and you may add it to your addressbook under a
-different name, which now will be displayed as the sender.</font></p>
-<p style="font-style: normal; line-height: 150%;"><font face="Arial, sans-serif">Of
-course, a mail without sender destination (&#8220;Anonymous&#8221; is
-displayed as sender) will have two x's.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Clicking
-one of the e-mails displayed in your inbox will open the mail. </font>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">The same
-applies to all other folders.</font></p>
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif">(Due to
-the distributed nature of I2P-Bote, sending as well as checking for
-and retrieving e-mails takes a few minutes. With mail routes
-activated respectively more. But you need not keep the browser open
-for that, simply leave I2P-Bote running as a background process &#8211;
-this is also benefits your anonymity)</font></p>
-<p style="line-height: 150%;"><br>
-</p>
-
-
-
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif"><u>2.2.3
-Local Address Book</u></font></p>
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif">If you
-have the I2P-Bote e-mail key from somebody you want to write to more
-frequently, it is handy to store that key locally into your address
-book (link on the left), specify a name of your own choosing for this
-contact and paste his mail destination in the corresponding line,
-<font color="#000000">then save.</font></font></p>
-<p style="line-height: 150%;"><font color="#000000"><font face="Arial, sans-serif">You
-should normally save destinations to your addressbook, so that next
-time you get a mail from the same sender it will be shown to be from
-the same, locally known sender (&#8220;Loc&#8221; is checked) and a mail sent
-by someone else who is just using the same user name will be marked
-as NOT known locally (an x in web-UI's 'Know' column or [UNK] before
-the sender address in POP3), so you know it's a new/different one. </font></font>
-</p>
-
-
-
-<p style="line-height: 150%;"><br><br>
-<font face="Arial, sans-serif"><u>2.2.4
-Settings (and what they mean)</u></font></p>
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif">Under
-settings you can choose the I2P-Bote interface's <i>language</i>
-(currently English or German) and decide whether even with a
-non-English language setting everything that will be automatically
-added to an e-mail when replying will nonetheless stay in English, so
-that the recipient does not know your I2P-Bote is set to a different
-language.<br>Otherwise the recipient could guess about your
-nationality which would decrease your anonymity. </font>
-</p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Here you
-can also adjust the interval for <i>automatic checking</i> of e-mails
-and decide whether or not to send any <i>time stamp</i> with your
-mails, indicating date and time when the mail was sent. The time
-stamps are always in UTC.</font></p>
-<p style="font-style: normal; line-height: 150%;"><font face="Arial, sans-serif">(When
-using mail routes, the timestamps are automatically disabled.) [<font color="#ff0000">not
-yet implemented</font>]</font></p>
-<p style="font-style: normal; line-height: 150%;"><br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><i>automatic
-checking for e-mails:</i></font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">For more
-comfort there is the &#8220;Check for mail every XX minutes&#8220; option. </font>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Here you
-can specify how often your I2P-Bote app should try to fetch unread
-mails for your identities. This can be set on a per-identity basis
-[<font color="#ff0000">not yet implemented</font>]</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">If you
-specify a random offset, then it will not check _exactly_ every XX
-minutes, but rather every (XX+-offset*XX)minutes, i.e. after a
-randomly chosen time between (1-offset)XX minutes and (1+offset)XX
-minutes. [<font color="#ff0000">not yet implemented</font>]</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">You can
-also totally disable the automatic checking for a given identity.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">(If you
-are not sure about these settings, the defaults should be ok for
-you.)</font></p>
-
-<p style="line-height: 150%;"><br><br>
-<font face="Arial, sans-serif"><i>Mail
-routes</i> are chains of I2P-Bote nodes acting as relays/routers for
-other peers and obeying to per-hop delays, thus providing the
-high-latency transport for increased anonymity. </font>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">You can
-specify the number of nodes (here called hops) that should be chained
-to form a mail route. Then each of the e-mail packets sent by the
-identity that has mail routes enabled will go through a mail route of
-n hops before being stored. You can set a delay for each hop
-individually, as no hop should know the time a packet will wait at
-the next hop, making the timing unpredictable. [<font color="#ff0000">individual
-per-hop and per-identity setting of delays not yet implemented</font>]</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">As delay
-you can specify a time frame (e.g. 60-600 minutes) &#8211; then a random
-wait time between the two values will be chosen for the packet at
-that hop &#8211; or a fix time, then the packet will be forwarded at that
-fix time, e. g. noon UTC, no matter when it arrived. [<font color="#ff0000">fix
-time not yet implemented</font>] </font>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">(When
-using mail routes, the timestamps are automatically disabled. [<font color="#ff0000">not
-yet implemented</font>])</font></p>
-
-
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif">Under
-&#8220;<i>mínimo en el bote</i>&#8221; (minimum threshold number of relay packets that
-will be sent) you can specify a threshold. As your node can only act
-reliably as a mix, if there are enough foreign packets to mix and to
-blend own packets with, it will accumulate messages who's delay time
-is over until reaching this lower limit. Only when it is surpassed,
-your node starts sending them out in random order. [<font color="#ff0000">Not
-yet implemented</font>]</font><br><br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><i>exclude
-identity from global checking</i> [<font color="#ff0000">Not yet
-implemented</font>]</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">If you
-enable this option for one of your identities, then this one will not
-be affected by the global manual checking for mails nor by any global
-automatic mail checking.</font></p>
-<p style="line-height: 150%;"><br><br>
-</p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><u>2.2.5
-E-mails to and from the Internet</u><span style="text-decoration: none;">
-[</span><font color="#ff0000"><span style="text-decoration: none;">NOT
-YET FULLY IMPLEMENTED!</span></font><span style="text-decoration: none;">]</span></font></p>
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif">In order
-to be able to send bote mails to the internet and to receive e-mails
-from the internet with your I2P-Bote application, you must first
-register with an appropriate mail gateway. Currently there is only
-one: postman. </font>
-</p>
-
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif">1) First, go to:
-<a href="http://hq.postman.i2p/?page_id=16">http://hq.postman.i2p/?page_id=16</a> and
-register an account. If you already have an account or if you have
-just created one as described, proceed with #2.</font></p>
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif">2) For an
-existing account you can add your I2P-Bote mail destination, so that
-e-mails coming from the internet are forwarded to your I2P-Bote app.
-To do so go to: <a href="http://hq.postman.i2p/?page_id=74">http://hq.postman.i2p/?page_id=74</a>
-and provide the requested information.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Now all
-e-mails sent to that address (<a href="mailto:name@i2pmail.org">name@i2pmail.org</a>
-from the outer internet or <a href="mailto:name@mail.i2p">name@mail.i2p</a>
-for mails from other postman subscribers) will be forwarded via the
-I2P-Bote network to your I2P-Bote app.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">(N.B.
-When using the <a href="mailto:name@mail.i2p">name@mail.i2p</a> or
-<a href="mailto:name@i2pmail.org">name@i2pmail.org</a> addresses
-instead of the long addresses, e-mails are no longer end-to-end
-encrypted. Therefore, it is recommended to exchange the I2P-Bote mail
-destination keys for communicating within the network. Postman has
-offered high quality services in I2P for quite a while already, but
-be aware that it's a centralized point that might go offline one day,
-or worse be taken over by an evildoer that will manipulate mails. As
-for network-internal e-mail communication, I2P-Bote makes sure that
-if you use the address keys, nobody can tamper with the mails you
-send or receive.)</font></p>
-
-
-
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">If you
-want not only to receive e-mails from the internet, but also enable
-sending e-mails from I2P-Bote to the internet, you must provide your
-I2P-Bote client with the gateway's mail destination key, so that your
-I2P-Bote knows where to send those mails to.<br>
-You can
-do this under &#8220;settings&#8221;. </font><font face="Arial, sans-serif">This
-gateway will allow I2P-Bote users to communicate with the standard
-e-mail users on the internet as well as with users of postman's
-classical i2pmail service (@mail.i2p).</font><br>
-<font face="Arial, sans-serif"><br>
-In order
-to fight abuse, there will be a limitation of the number of e-mails
-you can send out to the internet; just like for normal postman mail
-service users: If an I2P-Bote user exceeds the quota with outgoing
-e-mails, the additional e-mails will be sent back as bounce.</font></p>
-<p style="line-height: 150%;"><br><br>
-<br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><b>3.
-Considerations about Anonymity</b></font></p>
-
-<p style="line-height: 150%;"><br>
-<font face="Arial, sans-serif">Don't
-send identifying information about you (name, address, geographic
-location, time zone, age, websites you have just visited or blogged
-about, user names, ip numbers, I2P router id, I2P-Bote id, social
-security number, credit card number, &#8230;, copies of your passport,
-driver's license, home rental contract, photos &#8211; nude or with
-clothes &#8211;, documents that contain your username in author's
-settings, and many many more)!</font></p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><br>
-If
-possible, </font>
-</p>
-<ul><li><p style="line-height: 150%;"><font face="Arial, sans-serif">leave
-	I2P-Bote running 24/7,</font></p>
-	</li><li><p style="line-height: 150%;"><font face="Arial, sans-serif">use
-	mailroutes with randomized per-hop delays and/or per-hop fixed send
-	times, [<font color="#ff0000">not yet </font><font color="#ff0000"><i>fully</i></font><font color="#ff0000">
-	implemented</font>]</font></p>
-	</li><li><p style="line-height: 150%;"><font face="Arial, sans-serif">use
-	a long check interval,</font></p>
-	</li><li><p style="line-height: 150%;"><font face="Arial, sans-serif">use
-	a long local delay for own packets,</font></p>
-	</li><li><p style="line-height: 150%;"><font face="Arial, sans-serif">use
-	a big check interval randomization. [<font color="#ff0000">not yet
-	implemented</font>]</font></p>
-</li></ul>
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif">You can
-suppress the sending of date and time in the e-mails' header.</font></p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">When you
-reply to an e-mail, certain markers, such as &#8220;Re: [subject of the
-mail you're replying to]&#8221; or &#8220;[username] wrote:&#8221;. Those are
-different for the languages you can chose from in your language
-settings. However, if you don't want the recipient to know what
-language you have set, you can suppress translation of these markers,
-so that they will be in English, no matter what you language setting
-is. In order to do so, mark &#8220;Use English for text added to outgoing
-email ('Re:', 'wrote:', etc.) &#8220;</font></p>
-
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Be
-careful with the contents you send! Don't include personal
-information or information that only you can possess. Don't write I'm
-going to bed now, it's late when including time stamps.<br>
-The
-language in which your write your e-mails, your style and
-formulations can also be of interest for an attacker.</font></p>
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif">I2P-Bote
-also offers the possibility to use different e-mail
-identities.<br>Suppose one of you contacts learns about your
-identity, as you forgot to erase identifying information in a secret
-document you have sent to him. Now if this e-mail's recipient was to
-collaborate with others you are in contact with, he could tell them
-the real world identity belonging to the Bote address he knows from
-you. Thusly, if you communicate with those others using the same Bote
-address, they will know who you are.<br>Not so, if you used a
-different address for sending mails to them.</font></p>
-
-
-
-<p style="line-height: 150%;"><br><br>
-<font face="Arial, sans-serif"><b>4.
-Technical Concept</b></font></p>
-
-<p style="line-height: 150%;"><br>
-<font face="Arial, sans-serif">I2P-Bote
-is an end-to-end encrypted, network-internal, fully decentralized
-(i.e. serverless) e-mail system. It supports different identities and
-does not expose e-mail headers. Currently, it is still alpha software
-and can only by accessed via web console. It soon will have POP3
-support, and it is planned to guarantee additional anonymity by
-providing a high-latency transport option. All bote-mails are
-automatically end-to-end encrypted, so that there's no need to set up
-extra e-mail encryption (though you can do that), and bote-mails will
-be authenticated automatically. As it is decentralized, there is no
-e-mail server that could link different e-mail identities as
-communicating with each other (<i>profiling</i>): Even the nodes
-relaying the mails will not know the sender and apart from sender and
-receiver, only the end of the high-latency mail tunnel and the
-storing nodes will know to whom (anonymous identity) the mail is
-destined. The original sender can have gone offline, long before the
-mail becomes available on the other side. This adds on the degree of
-anonymity that can be reached with I2P-Bote. For those who do not
-want high delays: All these settings are be user-adjustable, so each
-user decides on how much anonymity he wants.</font></p><font face="Arial, sans-serif"><font color="#000000"><br>I2P-Bote
-nodes store encrypted e-mails into a Kademlia DHT. Therefore, an
-e-mail can be sent through a number of other
-nodes (relays) for increased security, or directly to<font face="Arial, sans-serif"><font color="#000000"> a
-set of storage nodes for faster delivery. The same applies to
-retrieving email.<br>(When using mail routes, timestamps are
-automatically disabled.)<br></font>[Retrieving via relays not yet
-implemented]</font></font></font>
-<p><br>
-</p>
-<p style="line-height: 150%;"><font color="#000000"><font face="Arial, sans-serif">All
-nodes are created equal: There are no "supernodes" or
-designated relay/storage nodes. Everybody acts as a potential relay
-and storage node. The maximum amount of disk space used for
-relayed/stored email packets can be configured by the user.</font></font></p>
-<p style="line-height: 150%;"><font color="#000000"><font face="Arial, sans-serif">Before
-an email is sent to a relay, it is broken up into packets and
-encrypted with the recipient's public key. These packets are stored
-redundantly in a distributed hash table (DHT).</font></font></p>
-<p style="line-height: 150%;"><font color="#000000"><font face="Arial, sans-serif">They
-are kept for at least 100 days, during which the recipient can
-download them.</font></font></p>
-<p style="line-height: 150%;"><font color="#000000"><font face="Arial, sans-serif">Relay
-packets also expire after 100 days or more.</font></font></p>
-<p style="line-height: 150%;"><font color="#000000"><font face="Arial, sans-serif">If
-a node runs out of email storage space, and there are no old packets
-that can be deleted, the node refuses storage requests.</font></font></p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Furthermore,
-I2P-Bote sanitizes the mail headers and does not allow any unneeded
-information to be transmitted, thus allowing the use of e-mail
-clients without prior checks of what this client sends in the mail
-headers. [<font color="#ff0000">POP3 not yet implemented</font>]</font></p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">All the
-encryption, path choosing and profiling is done locally so that there
-is no trusted party involved.</font></p>
-<p style="font-weight: normal; line-height: 150%;"><font face="Arial, sans-serif">Using
-I2P-Bote appropriately, that means keeping in mind the considerations
-given above and showing some common sense, nobody will be able to
-find out who or where you are. And if you are already being observed
-and your internet connection sniffed, the observer will not be able
-to find out what you send or receive or to whom you are sending to or
-receiving from or where your contacts are located.</font></p>
-
-<p style="line-height: 150%;"><br></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><br>
-Let's go
-a bit more into detail:</font></p>
-
-<p style="line-height: 150%;"><br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><u>What
-I2P-Bote <i>does hide</i>:</u></font></p>
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif"><i>I2P-Bote
-hides</i> both, the identity and location of sender and receiver, as
-well as those of intermediary nodes (relays and storing nodes), the
-content of your mails, their size, the number of mails you send.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Only the
-recipient can know the sender's bote mail destination, and if he
-choses not to send his destination, not even the recipient will know
-it.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Even if
-you send time stamps, your time zone will not be disclosed.</font></p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Furthermore,
-I2P-Bote hides ...</font></p>
-<p style="line-height: 150%;">&nbsp;&nbsp;&nbsp; <font face="Arial, sans-serif">- the
-fact that you run I2P-Bote</font></p>
-<p style="line-height: 150%;">&nbsp;&nbsp;&nbsp; <font face="Arial, sans-serif">- the
-fact that you send a mail</font></p>
-<p style="line-height: 150%;">&nbsp;&nbsp;&nbsp; <font face="Arial, sans-serif">- the
-fact that you receive a mail</font></p>
-<p style="line-height: 150%;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <font face="Arial, sans-serif">and
-hence</font></p>
-<p style="line-height: 150%;">&nbsp;&nbsp;&nbsp; <font face="Arial, sans-serif">- the
-time you send a mail</font></p>
-<p style="line-height: 150%;">&nbsp;&nbsp;&nbsp; <font face="Arial, sans-serif">- the
-time you receive a mail</font></p>
-<p style="line-height: 150%;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;     <font face="Arial, sans-serif">and</font></p>
-<p style="line-height: 150%;">&nbsp;&nbsp;&nbsp; <font face="Arial, sans-serif">- the
-upper limit of number of mails an unknown user receives, - nota bene:
-an abstract <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;   user, no concrete one, just concluding its
-existence from the existence of the mail identity<br>&nbsp;&nbsp;&nbsp; - as he
-could always have more than one e-mail identity; and the lower limit
-as an <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; identity also sends out test and dummy messages</font></p>
-<p style="line-height: 150%;"><br><br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><u>What
-I2P-Bote <i>hides partially</i>: </u></font>
-</p>
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif">The
-I2P-Bote address of the recipient will only be known to sender and
-recipient(s). </font>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">In case
-of multiple recipients, each one will see all other recipients that
-the mail was addressed to via &#8220;To:&#8221; or &#8220;CC:&#8221;. </font>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">All
-entries that were under &#8220;BCC:&#8221; will only be visible to the sender
-and this very recipient. </font>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">The time
-an sent time will, if at all, only be visible to sender and
-recipient.</font></p>
-
-
-
-<p style="line-height: 150%;"><br><br>
-<font face="Arial, sans-serif"><u>What
-I2P-Bote <i>can hide</i> optionally: </u></font>
-</p>
-
-<p style="line-height: 150%;"><br><br>
-<font face="Arial, sans-serif">- If
-mail routes are use, the time a bote mail is sent</font></p>
-<p style="line-height: 150%;"> <font face="Arial, sans-serif">- If
-mail routes are used, the time a bote mail is fetched. [<font color="#ff0000">not
-yet implemented</font>]</font></p>
-<p style="line-height: 150%;"> <font face="Arial, sans-serif">- If the
-sender suppresses timestamps only the sender himself will know when
-he sent a<br>   mail.</font></p>
-
-
-<p style="line-height: 150%;"><br><br>
-<font face="Arial, sans-serif"><u>What
-I2P-Bote <i>cannot hide</i>: </u></font>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><br>
-I2P-Bote
-cannot hide the frequency a given identity checks for new mails nor
-the number of mails a given identity receives.</font></p>
-<p style="line-height: 150%;"><br><br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><br>
-Not even
-for bootstrapping I2P-Bote depends on a central node, as it uses
-Seedless.<br>
-</font></p>
-
-<p style="line-height: 150%;"><br><br>
-<br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><b>5
-Terminology/Glossary of Terms:</b></font></p>
-<p style="line-height: 150%;"><br>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><i><u>I2P-Bote
-(router/node) id</u>:</i></font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">This is
-the id an I2P-Bote router is known as. It is used for contacting this
-router, for storing, relaying and fetching mails, but also used in
-the hop-to-hop encryption and for simply contacting it via I2P, as it
-is at the same the I2P-Bote router's I2P tunnel destination. It is
-displayed to represent an I2P-Bote node in the stats.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">So the
-router id corresponds to the I2P destination (the address of an
-I2P-Bote node on the I2P network - there is no need to know it unless
-you are having problems connecting to other I2P-Bote nodes.)</font></p>
-
-
-<p style="font-weight: normal; line-height: 150%;"><br><font face="Arial, sans-serif"><i><u>I2P-Bote
-e-mail destination:</u></i></font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">The
-I2P-Bote e-mail destination (key) is an identifier by which somebody
-can be reached via I2P-Bote, so as the name states: an e-mail
-destination. Thus it is for I2P-Bote what an e-mail address is for
-standard e-mail system: The e-mail destination is the actual address
-for sending e-mails, for storing them into and for fetching them from
-the DHT. <br>At the same time it used for the end-to-end encryption
-of e-mails, header information and attachments. </font>
-</p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">An
-I2P-Bote e-mail destination is a Base64 string containing a public
-encryption key and a signature verification key. Example:</font></p>
-<p style="line-height: 150%;">  
-</p>
-<p style="line-height: 150%;"> 
-<font face="Arial, sans-serif">uQtdwFHqbWHGyxZN8wChjWbCcgWrKuoBRNoziEpE8XDt8koHdJiskYXeUyq7JmpG</font></p>
-<p style="line-height: 150%;"> 
-<font face="Arial, sans-serif">In8WKXY5LNue~62IXeZ-ppUYDdqi5V~9BZrcbpvgb5tjuu3ZRtHq9Vn6T9hOO1fa</font></p>
-<p style="line-height: 150%;"> 
-<font face="Arial, sans-serif">FYZbK-FqHRiKm~lewFjSmfbBf1e6Fb~FLwQqUBTMtKYrRdO1d3xVIm2XXK83k1Da</font></p>
-<p style="line-height: 150%;"> 
-<font face="Arial, sans-serif">-nufGASLaHJfsEkwMMDngg8uqRQmoj0THJb6vRfXzRw4qR5a0nj6dodeBfl2NgL9</font></p>
-<p style="line-height: 150%;"> 
-<font face="Arial, sans-serif">HfOLInwrD67haJqjFJ8r~vVyOxRDJYFE8~f9b7k3N0YeyUK4RJSoiPXtTBLQ2RFQ</font></p>
-<p style="line-height: 150%;"> 
-<font face="Arial, sans-serif">gOaKg4CuKHE0KCigBRU-Fhhc4weUzyU-g~rbTc2SWPlfvZ6n0voSvhvkZI9V52X3</font></p>
-<p style="line-height: 150%;"> 
-<font face="Arial, sans-serif">SptDXk3fAEcwnC7lZzza6RNHurSMDMyOTmppAVz6BD8PB4o4RuWq7MQcnF9znElp</font></p>
-<p style="line-height: 150%;"> 
-<font face="Arial, sans-serif">HX3Q10QdV3omVZJDNPxo-Wf~CpEd88C9ga4pS~QGIHSWtMPLFazeGeSHCnPzIRYD</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><br>I2P-Bote
-router/node id and I2P-Bote e-mail destinations look similar, but are
-completely independent of each other.</font></p>
-
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif"><i><u>E-mail
-address:</u></i></font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">E-mail
-addresses in I2P-Bote are shortcuts for e-mail destinations.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">The
-e-mail address &lt;--&gt; e-mail destination mappings are stored in
-two places: the local address book and the distributed address
-directory [<font color="#ff0000">the latter not yet implemented</font>].</font></p>
-
-
-<p style="line-height: 150%;"><br><font face="Arial, sans-serif"><i><u>I2P-Bote
-e-mail identity:</u></i></font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">The
-I2P-Bote e-mail identity is a set of an I2P-Bote e-mail destination
-key, the corresponding private keys and a name given to it by the
-user. This name will be sent with the destination key if you do not
-suppress sending information about the sender.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">However
-it will only be displayed for the recipient in case he does not have
-a name for this destination in his local address book.</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">So
-technically speaking, an e-mail identity consists of four things:</font></p>
-<p style="line-height: 150%;">   <font face="Arial, sans-serif">* an
-e-mail destination (i.e. two public keys)</font></p>
-<p style="line-height: 150%;">   <font face="Arial, sans-serif">* two
-private keys for the e-mail destination</font></p>
-<p style="line-height: 150%;">   <font face="Arial, sans-serif">* a
-public name which can be shown to other people in e-mails</font></p>
-<p style="line-height: 150%;">   <font face="Arial, sans-serif">* a
-description which is not shown to anybody but you.</font></p>
-<p style="line-height: 150%;">     <font face="Arial, sans-serif">(It
-helps you remember which e-mail identity you use for which purpose.)</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">An e-mail
-identity is not required for sending emails (although then only
-"Anonymous" can be selected for the "sender"
-field).</font></p>
-<p style="line-height: 150%;"><br></p><p style="line-height: 150%;"><font face="Arial, sans-serif"><span style="text-decoration: underline; font-style: italic;">Mail
-routes</span>:</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Mail
-routes are an additional high-latency transport for I2P-Bote. For
-this, a chain of I2P-Bote nodes is built, acting as relays/routers
-for packets and obeying to individual per-hop delays; [<font color="#ff0000">still
-no individual setting for delays implemented</font>]</font></p>
-<p style="line-height: 150%; font-weight: bold;"><font face="Arial, sans-serif"><br>
-BEWARE!</font></p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">If you
-choose this option - especially with many hops and / or long delay
-times, don't be surprised if your mail does not reach its destination
-too soon. It will, of course, take longer &#8211; up to several days!</font><br>
-</p>
-<p style="line-height: 150%;"><br>
-<br>
-</p>
-
-<p style="line-height: 150%; font-weight: bold; font-style: italic;"><font face="Arial, sans-serif">6.&nbsp; Credits</font></p>
-<p style="line-height: 150%;">
-
-
-	
-	
-	
-	
-
-
-
-
-</p><p style="line-height: 150%;"><font face="Arial, sans-serif">Idea &amp;
-technical concept: HungryHobo, Mixxy</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Implementation:
-HungryHobo</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Plugin
-support: zzz, HungryHobo</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">User
-interface: HungryHobo</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Seedless
-integration: sponge</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">German
-translation: HungryHobo</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">French
-translation: albat, Redzara, Mixxy</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Spanish
-translation: Mixxy</font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif">Alpha
-testing: HungryHobo, Mixxy, Returning Novice, sponge, and many others</font></p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><b><br>
-<br>
-</b></font></p>
-<p style="line-height: 150%;"><font face="Arial, sans-serif"><b>7.
-Technical Details</b></font></p>
-
-<p style="line-height: 150%;"><font face="Arial, sans-serif">-- see
-techdoc.txt --</font></p>
-<p style="line-height: 150%;"><br><br>
-</p>
-<p style="line-height: 150%;"><br><br>
-</p>
-<p style="line-height: 150%; font-weight: bold; font-style: italic;"><font face="Arial, sans-serif">ENJOY THE
-BOTE FEELING!!</font></p>
-</body></html>

WebContent/User's Guide_fr.html

@@ -1,862 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
-	<TITLE>Guide de l'utilisateur</TITLE>
-	<META NAME="GENERATOR" CONTENT="LibreOffice 3.3  (Linux)">
-	<META NAME="CREATED" CONTENT="0;0">
-	<META NAME="CHANGED" CONTENT="20110407;10200100">
-	<STYLE TYPE="text/css">
-	<!--
-		@page { margin: 2cm }
-		P { margin-bottom: 0.21cm }
-		A:link { so-language: zxx }
-	-->
-	</STYLE>
-</HEAD>
-<BODY LANG="fr-FR" DIR="LTR">
-<P ALIGN=CENTER STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><B>Guide
-de l'utilisateur I2P-Bote</B></FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><B>1.
-Introduction</B></FONT></P>
-<P STYLE="line-height: 150%"><BR><BR><FONT FACE="Arial, sans-serif">I2P-Bote
-est une application de messagerie sécurisée pour I2P, à anonymat
-élevé et simple à utiliser. C'est un système sans serveur,
-entièrement décentralisé, qui constitue et génère un réseau
-pairs à pairs sur le réseau d'anonymisation I2P, lui-même conçu
-selon les règles de l'art ; l'adjonction optionnelle d'un transport
-à la façon de Mixminion le débarrasse des faiblesses intrinsèques
-des réseaux à basse latence.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">I2P-Bote
-tire donc le meilleur de l'anonymat fourni par I2P, à quoi il
-apporte son propre niveau supplémentaire d'anonymat par l'ajout
-d'une autre couche d'anonymisation (sur-réseau).</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Ce
-concept d'anonymat étagé est ce rend I2P-Bote si souple :</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Vous
-pouvez le configurer pour être extrêmement anonyme et lent, ou
-moins anonyme mais plus rapide et efficace. Dans tous les cas,
-I2P-Bote<FONT COLOR="#000000"> procure toujours un très bon anonymat
-à l'expéditeur et au destinataire, ainsi qu'un cryptage de bout en
-bout*. </FONT></FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT COLOR="#000000"><FONT FACE="Arial, sans-serif">I2P-Bote
-permet de rendre vos communications encore plus anonymes, en activant
-les routes à haute latence – au prix d'une baisse de performance,
-cependant. Les utilisateurs qui souhaitent que leurs messages
-arrivent au plus vite peuvent désactiver les routes de messages et
-utiliser l'envoi «&nbsp;direct&nbsp;» sur I2P. Ils sont ainsi
-assurés de bénéficier au minimum de l'anonymat d'origine des
-connexions I2P. </FONT></FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><FONT COLOR="#000000">Pour
-atteindre une ergonomie élevée, nous l'avons conçu pour qu'il
-puisse fonctionner avec les logiciels clients de messagerie standards
-tels que Thunderbird, Evolution ou Kmail, sans avoir à se préoccuper
-des informations supplémentaires que ces applications envoient dans
-leurs en-têtes [</FONT><FONT COLOR="#ff0000">PAS ENCORE IMPLÉMENTÉ</FONT><FONT COLOR="#000000">].
-De plus, il y a une interface web qui vous permet d'envoyer et de
-recevoir des messages, et de gérer vos préférences et vos
-identités.</FONT></FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">I2P-Bote
-est facile à utiliser : si vous n'utilisez pas déjà I2P, installez
-le depuis <A HREF="http://www.i2p2.de/">http://www.i2p2.de</A> puis
-installez le greffon I2P-Bote comme expliqué dans ce manuel. Sinon,
-continuez la lecture!**</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><I>La
-version actuelle est la 0.2.6.</I></FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">*Sauf si
-vous recevez ou envoyez des messages de/vers l'Internet classique,
-TOUS les messages – le corps, les pièces jointes et les en-têtes
-à part l'adresse du destinataire (objet, date et heure,
-expéditeur,...) sont automatiquement cryptés de bout en bout de
-façon transparente. L'adresse du destinataire n'est visible que par
-le dernier nœud de la route qui stocke les paquets dans le réseau
-kad, ainsi que par les nœuds de stockage, mais ils ne peuvent pas
-lire les messages, ni qui l'a envoyé, ni qui le relèvera.</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">**Bien
-sûr, vous pouvez aussi le compiler à partir des sources.</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><B>2.
-Procédures</B></FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><U>2.1.
-Installation</U></FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Pour
-installer I2P-Bote, rendez-vous en bas de la page de configuration du
-client I2P sur </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><A HREF="http://localhost:7657/configclients.jsp">http://localhost:7657/configclients.jsp</A>
-</FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">en entrez
-:</FONT></P>
-<P STYLE="line-height: 150%"><A HREF="http://tjgidoycrw6s3guetge3kvrvynppqjmvqsosmtbmgqasa6vmsf6a.b32.i2p/i2pbote.xpi2p"><FONT FACE="Arial, sans-serif">http://tjgidoycrw6s3guetge3kvrvynppqjmvqsosmtbmgqasa6vmsf6a.b32.i2p/i2pbote.xpi2p</FONT></A></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">(<A HREF="http://i2pbote.i2p/i2pbote.xpi2p">http://i2pbote.i2p/i2pbote.xpi2p</A>
-marche aussi, si vous avez i2pbote.i2p dans votre carnet d'adresses
-ou un abonnement)</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">dans le
-champ «&nbsp;…, URL de téléchargement&nbsp;:&nbsp;», puis
-cliquez sur le bouton «&nbsp;Installer le greffon&nbsp;». Attendez
-jusque à ce que le panneau de surveillance sur la gauche indique que
-le greffon est installé et démarré. </FONT>
-</P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Pour
-mettre à jour I2P-Bote, dans la même page, cliquez sur «&nbsp;Mise
-à jour&nbsp;»dans le cadre dédié au greffon une fois celui-ci
-installé.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><U>2.2.
-Utiliser I2P-Bote</U></FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">Dans
-la console du routeur <A HREF="http://127.0.0.1:7657/">http://127.0.0.1:7657/</A>
-cliquez sur </FONT><FONT FACE="Arial, sans-serif"><I>SecureMail</I></FONT>
-<FONT FACE="Arial, sans-serif">en haut à gauche dans le panneau de
-surveillance. Vous êtes maintenant dans l'interface web d'I2P-Bote.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Après
-son lancement, I2P-Bote a besoin d'un peu plus de trois minutes pour
-être entièrement opérationnel (Il est configuré pour démarrer
-automatiquement en même temps que le routeur). </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Donc,
-quand le panneau de surveillance indique «&nbsp;Réseau&nbsp;: OK&nbsp;»,
-c'est prêt..</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Si vous
-utiliser I2P-Bote pour vous-même, il vous faut créer une identité.</FONT>
-</P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><U>2.2.1
-Création d'une identité</U></FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">Cliquez
-sur «&nbsp;Identités&nbsp;» sur la gauche, puis sur le bouton
-«&nbsp;Nouvelle identité&nbsp;».</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Entrez au
-moins un «&nbsp;Nom public&nbsp;» et cliquez sur «&nbsp;Créer&nbsp;».
-C'est tout ce qu'il faut faire pour créer une identité.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Le nom
-public est le nom que vous voyez pour cette identité (utile quand
-vous en avez plusieurs, pour communiquer avec différents groupes
-d'utilisateurs ou pour des besoins différents) et il sera envoyé
-aux destinataires en tant que «&nbsp;nom d'expéditeur&nbsp;». Il
-n'est pas nécessaire qu'il soit unique. </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">(Comme on
-peut choisir ici n'importe quel nom – n'importe qui pourrait
-choisir ici HungryHobo comme nom public – ce champ n'est pas conçu
-pour apporter au destinataire la certitude que deux messages
-proviennent du même expéditeur. C'est pourquoi c'est le nom
-sauvegardé dans le carnet d'adresses local [il ne peut y avoir qu'un
-seul nom par clé de destination] qui est affiché dans la boîte de
-réception si l'expéditeur en a sélectionné un lors de l'envoi
-[envoi non anonyme], et vous verrez alors une marque verte dans la
-colonne «&nbsp;Connu&nbsp;» même si le nom public spécifié par
-l'expéditeur est différent pour cette sienne identité, indiquant
-ainsi qu'il s'agit bien de la destination connue localement. S'il n'y
-a pas d'entrée pour une destination donnée dans le carnet
-d'adresses, le nom indiqué par l'expéditeur est affiché précédé
-du préfixe [UNK] dans les logiciels clients de messagerie) [<FONT COLOR="#ff0000">POP3
-N'EST PAS ENCORE IMPLÉMENTÉ</FONT>].</FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">Vous
-pouvez aussi compléter les autres champs, si vous le souhaitez :</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Description
-– ce champ est conservé localement, pas diffusé. Il ne sert qu'à
-vous : si vous voulez ajouter des informations supplémentaires à
-votre usage au sujet de cette identité, ce champ est prévu pour
-cela. </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Adresse
-e-mail – champ pas encore utilisé.</FONT><FONT COLOR="#ff0000"><FONT FACE="Arial, sans-serif"><BR></FONT></FONT><BR><FONT COLOR="#000000"><FONT FACE="Arial, sans-serif">Choisissez
-un algorithme de cryptage parmi ceux proposés. Dans le doute, gardez
-celui proposé par défaut.</FONT></FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Vous
-pouvez cliquer sur une de vos identités et copier la longue clé
-affichée sous «&nbsp;Destination de messagerie&nbsp;». C'est votre
-adresse e-mail I2P-Bote. Si vous voulez recevoir des messages de
-quelqu'un, il faudra la lui transmettre.</FONT><BR><BR><FONT FACE="Arial, sans-serif">Vous
-pouvez maintenant envoyer et recevoir des messages I2P-Bote.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Mais vous
-devriez regarder les réglages d'I2P-Bote et vous assurer qu'il sont
-conformes à vos besoins.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">(Vous
-pouvez créer plusieurs identités et leur associer des réglages
-différents.)</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><U><BR>2.2.2
-Envoyer et recevoir des messages</U></FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Vous avez
-besoin de la clé de destination de message I2P-Bote du correspondant
-à qui vous voulez envoyer un message bote. </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Pour
-envoyer un message, cliquez sur «&nbsp;Nouveau&nbsp;», choisissez
-votre identité d'expéditeur ou «&nbsp;Anonyme&nbsp;» dans le
-champ «&nbsp;De&nbsp;:&nbsp;» et entrez la destination du
-destinataire dans le champ «&nbsp;À&nbsp;:&nbsp;», ou une adresse
-mail.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">(Vous
-pouvez aussi cliquer sur le bouton «&nbsp;Carnet d'adresses&nbsp;»
-tout proche de ce champ, pour choisir une destination stockée
-localement dans votre carnet d'adresses&nbsp;: cochez le/les
-utilisateur(s) destinataires et cliquez sur le bouton “Ajouter les
-destinataires&nbsp;»)</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Vous
-pouvez ajouter plusieurs destinataires et changer l'attribut «&nbsp;À&nbsp;:&nbsp;»
-pour «&nbsp;Cc:&nbsp;» ou «&nbsp;Cci:&nbsp;».</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Le bouton
-«&nbsp;+&nbsp;» ajoute des lignes destinataires supplémentaires.</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Rédigez
-maintenant votre message bote et cliquez sur «&nbsp;Envoyer&nbsp;»pour...
-l'envoyer, ou «&nbsp;Enregistrer&nbsp;» pour le sauvegarder dans
-votre dossier «&nbsp;Brouillons&nbsp;» ou tout autre dossier
-personnel [<FONT COLOR="#ff0000">pas encore implémenté</FONT>].</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">L'action
-d'envoi déplace le message dans le dossier «&nbsp;Boîte d'envoi&nbsp;»
-et vous pouvez continuer à utiliser I2P-Bote, par exemple pour
-écrire un autre message, gérer votre carnet d'adresses, etc...
-I2P-Bote est alors en train d'envoyer votre message. Une fois envoyé,
-il est déplacé de la boîte d'envoi vers le dossier «&nbsp;Courriers
-envoyés&nbsp;». Votre message est en route (à moins que vous
-n'ayez défini un retard, ce qui n'est pas activé pas défaut).</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Dans
-I2P-Bote, les messages sont signés automatiquement (sauf ceux que
-vous envoyez comme «&nbsp;Anonyme&nbsp;», c'est à dire sans
-choisir d'identité d'expéditeur)&nbsp;: en effet, vous pouvez
-décider de ne pas choisir d'identité d'expéditeur.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">De par
-les réglages par défaut, I2P-Bote relève le automatiquement
-courrier, et tout ce que vous avez à faire pour savoir si vous avez
-reçu de nouveaux messages est de regarder dans la boîte de
-réception (lien sur la gauche).<BR>Vous pouvez forcer une relève en
-cliquant cliquant sur le bouton «&nbsp;Relever le courrier&nbsp;».
-C'est une vérification globale qui tente de récupérer les nouveaux
-messages destinés à toutes vos identités à l'exception de celles
-exclues de cette fonctionnalité [</FONT><FONT COLOR="#ff0000"><FONT FACE="Arial, sans-serif">pas
-encore implémenté</FONT></FONT><FONT FACE="Arial, sans-serif">].</FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">Le
-nombre de messages non lus est indiqué entre parenthèses à
-proximité du nom du dossier dans le cadre de gauche. </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Cliquez
-sur «&nbsp;Boîte de réception&nbsp;» pour visualiser la liste des
-messages reçus. Vous y voyez deux colonnes peuplées de «&nbsp;x&nbsp;»
-et de coches vertes. Elles vous indiquent si le message en question
-contient un signature valide et qu'il est donc certifié comme
-authentique et intègre (Sig), et si la destination de l'expéditeur
-est déjà connue, c'est à dire déjà enregistrée dans votre
-carnet d'adresses (Connu). Donc, deux coches vertes pour un message
-signalent que vous connaissez son expéditeur et que le message a été
-signalé par lui. </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Si vous
-avez dans votre carnet d'adresses un certain nom et que vous recevez
-un message de la part d'une identité affichant ce nom, alors si la
-colonne «&nbsp;Connu&nbsp;» <U>n'indique pas</U> une <SPAN STYLE="font-style: normal">coche
-verte, c'est que le message provient d'une destination </SPAN><SPAN STYLE="font-style: normal"><U>différente</U></SPAN>
-<SPAN STYLE="font-style: normal">de celle contenue dans votre carnet
-d'adresses&nbsp;; son propriétaire a simplement choisi le même nom
-que celui d'un de vos contacts déjà enregistré.</SPAN></FONT></P>
-<P STYLE="font-style: normal; line-height: 150%"><FONT FACE="Arial, sans-serif">S'il
-y a une coche verte dans la colonne «&nbsp;Sig&nbsp;», c'est que le
-message est correctement signé et vous pouvez ajouter l'expéditeur
-à votre carnet d'adresses sous un nom différent qui sera dès lors
-affiché en tant qu'expéditeur.</FONT></P>
-<P STYLE="font-style: normal; line-height: 150%"><FONT FACE="Arial, sans-serif">Évidemment,
-un message sans destination d'expéditeur (“Anonyme” affiché
-comme expéditeur) sera repéré par deux marques «&nbsp;x&nbsp;».</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Un clic
-sur un des messages de la liste ouvre celui-ci. </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Ceci vaut
-pour tous les autres dossiers.</FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">(De
-par la nature décentralisée d'I2P-Bote, l'envoi comme la relève
-prennent quelques minutes. Sensiblement plus lorsque les routes de
-messages sont activées. Mais vous n'avez pas besoin de garder le
-navigateur ouvert&nbsp;: il suffit de laisser tourner I2P-Bote en
-tant que processus d'arrière plan – ce dont profite aussi votre
-anonymat)</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif"><U>2.2.3
-Carnet d'adresses local</U></FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">Si
-vous avez la clé de destination I2P-Bote de quelqu'un à qui vous
-voulez écrire souvent, il est commode de l'enregistrer dans votre
-carnet d'adresses local (lien sur la gauche)&nbsp;: choisissez un nom
-(de façon complètement arbitraire), collez la clé dans le champ
-idoine et sauvegardez.</FONT></P>
-<P STYLE="line-height: 150%"><FONT COLOR="#000000"><FONT FACE="Arial, sans-serif">C'est
-normalement ce que vous devriez faire, en sorte que le prochain
-message de ce destinataire soit marqué comme «&nbsp;Connu&nbsp;»,
-alors qu'un message d'un autre expéditeur de même nom serait marqué
-d'un «&nbsp;x&nbsp;» (ou préfixé [UNK] dans un client de
-messagerie), vous prévenant ainsi qu'il provient de quelqu'un
-d'autre. </FONT></FONT>
-</P>
-<P STYLE="line-height: 150%"><BR><BR><FONT FACE="Arial, sans-serif"><U>2.2.4
-Les préférences de réglages (et ce qu'elles signifient)</U></FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">Dans
-les préférences vous pouvez choisir la langue de l'interface
-d'I2P-Bote et décider que même si vous choisissez une autre langue,
-tout ce qui sera automatiquement ajouté comme titres d'en-têtes
-restera cependant en anglais pour ne pas dévoiler votre langue (et
-par là même, peut-être en déduire votre nationalité et
-compromettre votre anonymat – à ce sujet, la FAQ I2P-Bote et le
-chapitre 3 de ce manuel donnent d'autres conseils).</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Vous
-pouvez aussi régler l'intervalle de relève automatique, et
-l'inclusion ou l'exclusion des horodatages pour vos messages (les
-horodatages sont toujours en UTC).</FONT></P>
-<P STYLE="font-style: normal; line-height: 150%"><FONT FACE="Arial, sans-serif">(Quand
-vous utilisez les routes de messages, les horodatages sont
-automatiquement désactivés [<FONT COLOR="#ff0000">pas encore
-implémenté</FONT>]).</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><I>Relève
-automatique:</I></FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Pour le
-confort d'utilisation, cochez «&nbsp;Relever le courrier toutes les
-XX minutes&nbsp;:&nbsp;» et saisissez la valeur de l'intervalle. </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Ceci
-définit la fréquence de tentatives de téléchargement de nouveaux
-messages pour vos identités. Ça peut être différentié par
-identité [<FONT COLOR="#ff0000">pas encore implémenté</FONT>].</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Si vous
-définissez un décalage aléatoire, la relève n'aura pas lieu
-exactement toutes les XX minutes, mais toutes les
-(XX+/-décalage*XX)minutes, c'est à dire après un temps aléatoire
-compris entre (1-décalage)*XX minutes et (1+décalage)*XX minutes
-[<FONT COLOR="#ff0000">pas encore implémenté</FONT>].</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Vous
-pouvez également désactiver complètement la relève automatique
-pour une identité donnée.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">(Si vous
-n'êtes pas à l'aise avec ces réglages, les valeurs par défaut
-vous conviendront très bien)</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR><FONT FACE="Arial, sans-serif">Les
-</FONT><FONT FACE="Arial, sans-serif"><I>Routes de messagerie </I></FONT><FONT FACE="Arial, sans-serif">sont
-des chînes de nœuds I2P-Bote agissant en tant que routeurs relais
-pour le compte d'autres pairs et obéissant à des délais par saut
-définis par l'expéditeur, fournissant ainsi le transport à haute
-latence garant d'un anonymat plus élevé. </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Vous
-pouvez spécifier le nombre de nœuds (sauts) nécessaires à la
-constitution d'une route de messagerie. Ensuite, chacun des paquets
-de message envoyés par l'identité qui a activé la fonction routes
-de messagerie passera par une route de n sauts avant d'être stocké.
-Vous pouvez définir un délai pour chaque saut individuel, pour
-qu'aucun saut ne puisse savoir combien de temps le paquet attendra au
-niveau du saut suivant, ce qui rend la prédiction horaire impossible
-[<FONT COLOR="#ff0000">les définitions des retards par saut et par
-identité ne sont pas encore implémentées</FONT>].</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Vous
-pouvez définir une tranche de temps (p.e. 60-600 minutes) – puis
-un retard aléatoire entre ces deux valeurs sera choisi pour le
-paquet au niveau de tel saut – ou une heure fixe à laquelle le
-paquet sera transféré, p.e. cet après-midi UTC, indépendamment du
-moment où il est arrivé [<FONT COLOR="#ff0000">heure fixe pas
-encore implémentée</FONT>]. </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">(Quand
-vous utilisez les routes de messagerie, les horodatages sont
-automatiquement désactivés [<FONT COLOR="#ff0000">pas encore
-implémenté</FONT>]).</FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">Sous
-«&nbsp; </FONT><FONT FACE="Arial, sans-serif"><I>Minimum dans la
-messagerie</I></FONT>&nbsp;<FONT FACE="Arial, sans-serif">» (nombre
-minimum de paquets relayés à envoyer), vous pouvez indiquer un
-seuil. Comme votre instance I2P-Bote peut fonctionner comme un relais
-mélangeur, s'il y a suffisamment de paquets étrangers à mélanger
-et avec lesquels camoufler les vôtres, elle va accumuler les
-messages pour lesquels le retard demandé n'est pas échu jusqu'à
-atteindre ce seuil. Une fois atteint, votre bote commence à les
-transférer aléatoirement [</FONT><FONT COLOR="#ff0000"><FONT FACE="Arial, sans-serif">pas
-encore implémenté</FONT></FONT><FONT FACE="Arial, sans-serif">].</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><I>Exclure
-l'identité de la relève globale</I> [<FONT COLOR="#ff0000">pas
-encore implémenté</FONT>].</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Si vous
-activez cette option pour une de vos identités, elle ne sera pas
-prise en compte ni par la fonction de relève globale automatique
-planifiée, ni par la relève manuelle globale.</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><U>2.2.5
-E-mails de et vers l'Internet</U><SPAN STYLE="text-decoration: none">
-[</SPAN><FONT COLOR="#ff0000"><SPAN STYLE="text-decoration: none">NOT
-YET FULLY IMPLEMENTED!</SPAN></FONT><SPAN STYLE="text-decoration: none">]</SPAN></FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">Pour
-pouvoir envoyer des messages bote vers l'Internet et recevoir des
-e-mails venant de l'Internet dans l'application I2P-Bote, vous devez
-d'abord vous enregistrer auprès d'une passerelle de messagerie. Il
-n'y en a actuellement qu'une seule&nbsp;: postman. </FONT>
-</P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">1)
-D'abord, allez sur : <A HREF="http://hq.postman.i2p/?page_id=16">http://hq.postman.i2p/?page_id=16</A>
-et créez un compte. Si vous en avez déjà un, ou si vous venez de
-le créer, passer à l'étape 2).</FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">2)
-Pour un compte donné, vous pouvez ajouter votre clé de destination
-de messagerie, pour que les messages arrivant d'Internet puissent
-être transférés vers votre application I2P-Bote. Pour ce faire
-allez sur : <A HREF="http://hq.postman.i2p/?page_id=74">http://hq.postman.i2p/?page_id=74</A>
-et indiquez les informations demandées.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Maintenant,
-tous les e-mails envoyés à cette adresse (<A HREF="mailto:name@i2pmail.org">nom@i2pmail.org</A>
-depuis l'Internet externe ou depuis <A HREF="mailto:name@mail.i2p">blaze@mail.i2p</A>
-pour les messages d'autres comptes postman) seront transférés par
-le réseau I2P-Bote à votre application I2P-Bote.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">(N.B. En
-utilisant les adresses <A HREF="mailto:name@mail.i2p">nom@mail.i2p</A>
-ou <A HREF="mailto:name@i2pmail.org">nom@i2pmail.org</A> au lieu des
-longues clés de destination, les messages ne sont plus cryptés de
-bout en bout. En conséquence, il est recommandé d'échanger les
-clés I2P-Bote pour la communication intra réseau. Postman offre des
-services de haute qualité sur I2P depuis déjà un bon moment, mais
-soyez conscient qu'il s'agit d'un point centralisé qui pourrait un
-jour cesser de fonctionner, ou pire, tomber sous le contrôle d'un
-nuisible qui pourrait manipuler les courriers. Comme pour la
-messagerie intra réseau, I2P-Bote vous assure que si vous utilisez
-des clés de destination, personne ne peut bricoler les messages que
-vous recevez ou envoyez.)</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Si vous
-voulez non seulement recevoir des messages d'Internet, mais aussi
-pouvoir en envoyer vers Internet depuis I2P-Bote, vous devez indiquer
-à votre application cliente I2P-Bote la clé de destination de la
-passerelle de messagerie, pour que votre I2P-Bote sache où envoyer
-les messages.<BR>Ceci se fait dans les «&nbsp;Préférences&nbsp;».
-Cette passerelle permet aux utilisateurs d'I2P-Bote de communiquer
-avec les utilisateurs de messagerie standard sur l'Internet classique
-et avec ceux qui utilisent le service i2pmail de postman
-(@mail.i2p).</FONT><BR><FONT FACE="Arial, sans-serif"><BR>Pour
-combattre les abus, il y a une limitation au nombre de messages que
-vous pouvez envoyer vers Internet, comme avec le service normal de
-postman&nbsp;: si un utilisateur d'I2P-Bote dépasse le quota de
-messages envoyés, les messages supplémentaires sont retournés à
-l'envoyeur.</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><B>3.
-Considérations sur l'anonymat</B></FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">N'envoyez
-pas d'informations susceptibles de vous identifier (nom, adresse,
-situation géographique, fuseau horaire, horodatages, âge, sites web
-que vous venez de visiter ou sur lesquels vous venez de parler sur un
-blog, noms d'utilisateurs, adresses IP, identités de routeur I2P
-routeur, de nœud I2P-Bote, numéros de sécurité sociale, de carte
-de crédit, …, copies de passeport, de permis de conduire, de
-contrats de location, de photos – nu ou habillé –, documents qui
-contiennent votre nom comme auteur dans les réglages, et une
-multitude d'autres) !</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><BR>Si
-possible, </FONT>
-</P>
-<UL>
-	<LI><P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">laissez
-	I2P-Bote tourner 24h/24 7j/7,</FONT></P>
-	<LI><P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">utilisez
-	les routes de messagerie en conjonction avec les retards aléatoires
-	ou fixes par saut [<FONT COLOR="#ff0000">pas encore </FONT><FONT COLOR="#ff0000"><I>complètement</I></FONT><FONT COLOR="#ff0000">
-	implémenté</FONT>],</FONT></P>
-	<LI><P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">utilisez
-	un intervalle de relève long,</FONT></P>
-	<LI><P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">utilisez
-	un long retard pour vos propres paquets,</FONT></P>
-	<LI><P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">utilisez
-	un large intervalle de relève aléatoire [<FONT COLOR="#ff0000">pas
-	encore implémenté</FONT>].</FONT></P>
-</UL>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">Vous
-pouvez supprimer l'envoi des horodatages des en-têtes de messages.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Quand
-vous répondez, certains marqueurs comme, «&nbsp;Rép: [Top
-secret]&nbsp;» ou «&nbsp;[mégaphone] a écrit :&nbsp;» sont
-ajoutés à votre réponse. Ils diffèrent d'une langue à l'autre,
-suivant vos préférences de réglage de langue de l'interface
-d'I2P-Bote. Cependant, si vous ne voulez pas que vos destinataires
-puissent savoir comment vous avez effectué ce réglage (révélateur
-de votre langue et peut-être de votre nationalité), vous pouvez
-désactiver la traduction de ces marqueurs pour qu'il restent en
-anglais, quelle que soit votre réglage de langue&nbsp;: Cochez la
-case «&nbsp;Utiliser l'anglais pour les titres d'en-têtes de
-messages sortants ('Re', 'wrote', etc.)&nbsp;».</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Soyez
-prudent sur le contenu de vos envois! N'incluez pas d'information
-personnelles ou des informations que vous seul pouvez posséder.
-N'écrivez pas «&nbsp;je vais me coucher, il est tard&nbsp;»,
-lorsque les tampons horaires ne sont pas désactivés.<BR>La langue
-dans laquelle vous écrivez, votre style et vos particularités
-d'expression sont autant d'autres éléments qui pourraient
-intéresser un attaquant.</FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">I2P-Bote
-permet aussi l'utilisation d'identités multiples. Supposez qu'un de
-vos contacts découvre votre identité, car vous avez oublié
-d'enlever une information vous concernant d'un document confidentiel
-que vous lui avez transmis (par erreur ou pas). Maintenant, si ce
-correspondant est amené a communiquer/collaborer avec d'autres de
-vos contacts, il pourrait leur révéler l'identité réelle liée à
-l'identité Bote qu'il connait de vous. Donc, si vous communiquez
-avec ces autres avec la même adresse il vous reconnaitrons. Ils ne
-pourraient pas si vous aviez utilisé une identité différente pour
-vous adresser à eux.</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR><FONT FACE="Arial, sans-serif"><B>4.
-Concept technique</B></FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">I2P-Bote
-est un système de messagerie totalement décentralisé (sans
-serveur) intra réseau crypté de bout en bout. Il supporte
-l'utilisation d'identités multiples et n'expose pas les en-têtes de
-messages. Il est actuellement encore en version alpha et ne peut être
-utilisé que par son interface web intégré à la console du routeur
-I2P. Il disposera bientôt du support de POP3, et il est prévu qu'il
-garantisse un niveau d'anonymat supplémentaire via une option de
-transport à haute latence. Tous les messages bote sont cryptés
-automatiquement de bout en bout, de telle sorte qu'il ne soit pas
-nécessaire d'utiliser un autre système de cryptage (bien que ça
-soit possible), et les messages sont automatiquement authentifiés.
-Comme il est décentralisé, il n'y a pas de serveur de messagerie
-qui puisse établir de relation entre différentes identités en tant
-qu'elles communiqueraient les unes avec les autres (profilage) : même
-les nœuds relayant les messages ne connaissent pas l'expéditeur, et
-hormis l'expéditeur et le destinataire, seuls le point terminal du
-tunnel de messages à haute latence et les nœuds de stockage savent
-à qui (identité anonyme) le message est destiné. L'expéditeur
-peut être passé hors ligne depuis longtemps lorsque le message
-devient disponible côté destinataire. Ceci améliore la classe
-d'anonymat qui peut être atteinte par I2P-Bote. Pour ceux qui ne
-veulent pas de longs retards, tous ces réglages sont accessibles à
-l'utilisateur et chacun peut ainsi ajuster le niveau d'anonymat à
-ses désirs.</FONT></P>
-<P><FONT COLOR="#000000"><FONT FACE="Arial, sans-serif"><BR>Les
-nœudsI2P-Bote stockent les messages cryptés dans une table de
-hachage décentralisée (DHT) Kademlia. En conséquence, un message
-peut être envoyé via de nombreux autres nœuds (relais) pour
-augmenter la sécurité, ou directement sur un groupe de nœuds de
-stockage pour une livraison plus rapide. Le même scenario s'applique
-aussi à le relève des messages.<BR>(L'utilisation des routes de
-message désactive automatiquement les tampons horaires)<BR>[</FONT></FONT><FONT COLOR="#ff0000"><FONT FACE="Arial, sans-serif">La
-relève via les relais n'est pas encore implémentée</FONT></FONT><FONT COLOR="#000000"><FONT FACE="Arial, sans-serif">].</FONT></FONT></P>
-<P><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT COLOR="#000000"><FONT FACE="Arial, sans-serif">Tous
-les nœuds sont créés égaux : il n'y a pas de «&nbsp;super-nœuds&nbsp;»
-ni de nœuds désignés comme relais ou stockeurs. Tout le monde agit
-en tant que relais et stockage potentiels. L'utilisation d'espace
-disque est configurable par l'utilisateur.</FONT></FONT></P>
-<P STYLE="line-height: 150%"><FONT COLOR="#000000"><FONT FACE="Arial, sans-serif">Avant
-qu'un message ne soit envoyé à un relais, il est découpé en
-paquets et crypté avec la clé publique du destinataire. Ces paquets
-sont stockés de façon redondante dans la DHT.</FONT></FONT></P>
-<P STYLE="line-height: 150%"><FONT COLOR="#000000"><FONT FACE="Arial, sans-serif">Il
-sont conservés au moins 100 jours, pendant lesquels le destinataire
-peut les télécharger.</FONT></FONT></P>
-<P STYLE="line-height: 150%"><FONT COLOR="#000000"><FONT FACE="Arial, sans-serif">Les
-paquets relayés expirent aussi après 100 jours ou plus.</FONT></FONT></P>
-<P STYLE="line-height: 150%"><FONT COLOR="#000000"><FONT FACE="Arial, sans-serif">Si
-un nœud manque d'espace de stockage et qu'il n'y a pas de vieux
-paquets à supprimer, ce nœud refuse les requêtes de stockage.</FONT></FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">De plus,
-I2P-Bote nettoie les en-têtes de messages en n'autorisant que les
-informations indispensables à la transmission, permettant ainsi
-l'utilisation de clients de messagerie sans vérification préalable
-de ce qu'ils ajoutent comme en-têtes bavardes [<FONT COLOR="#ff0000">POP3
-pas encore implémenté</FONT>].</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Tout le
-cryptage, le choix des chemins et le profilage sont effectués
-localement en sorte qu'aucune tierce partie de confiance ne soit mise
-à contribution.</FONT></P>
-<P STYLE="font-weight: normal; line-height: 150%"><FONT FACE="Arial, sans-serif">Par
-une utilisation appropriée d'I2P-Bote, c'est à dire en gardant à
-l'esprit les considérations signalées plus haut relatives au bon
-sens, personne ne saura qui vous êtes ni où vous vous trouvez. Et
-si vous êtes déjà surveillé et que votre connexion Internet est
-sur écoutes, le nuisible ne pourra pas savoir ce que vous envoyez ou
-recevez, ni avec qui vous communiquez et où sont situés vos
-correspondants.</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><BR>Rentrons
-un peu dans les détails&nbsp;:</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><U>Ce
-qu'I2P-Bote <I>cache</I> :</U></FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif"><I>I2P-Bote
-cache à la fois, l'identité et la situation de l'expéditeur et du
-ou destinataires, celles des nœuds intermédiaires (relais et
-stockage), le contenu des messages, leur taille, le nombre que vous
-envoyez.</I></FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Seul le
-destinataire peut connaître l'adresse de l'expéditeur du message
-bote, et si ce dernier l'a décidé, même le destinataire peut être
-tenu dans l'ignorance de cette donnée.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Même si
-envoyez des horodatages, votre fuseau horaire ne sera pas dévoilé.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">De plus,
-I2P-Bote masque ...</FONT></P>
-<P STYLE="line-height: 150%">&nbsp;&nbsp;&nbsp; <FONT FACE="Arial, sans-serif">-
-le fait que vous utilisez... I2P-Bote</FONT></P>
-<P STYLE="line-height: 150%">&nbsp;&nbsp;&nbsp; <FONT FACE="Arial, sans-serif">-
-le fait que vous envoyez un message</FONT></P>
-<P STYLE="line-height: 150%">&nbsp;&nbsp;&nbsp; <FONT FACE="Arial, sans-serif">-
-le fait que vous recevez un message</FONT></P>
-<P STYLE="line-height: 150%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <FONT FACE="Arial, sans-serif">et
-donc</FONT></P>
-<P STYLE="line-height: 150%">&nbsp;&nbsp;&nbsp; <FONT FACE="Arial, sans-serif">-
-le moment d'envoi d'un message</FONT></P>
-<P STYLE="line-height: 150%">&nbsp;&nbsp;&nbsp; <FONT FACE="Arial, sans-serif">-
-le moment de réception d'un message</FONT></P>
-<P STYLE="line-height: 150%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <FONT FACE="Arial, sans-serif">ainsi
-que</FONT></P>
-<P STYLE="line-height: 150%">&nbsp;&nbsp;&nbsp; <FONT FACE="Arial, sans-serif">-
-la limite supérieure du nombre de messages qu'un utilisateur inconnu
-reçoit, - nota bene : un utilisateur abstrait, pas un concret,
-extrapolant simplement son existence de celle de la destination de
-messagerie<BR>&nbsp;&nbsp;&nbsp; - car il pourrait toujours avoir
-plus d'une identité ; et la limite basse, car une identité envoie
-également des messages de test et des messages leurres/«&nbsp;bidons&nbsp;»</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><U>Ce
-qu'I2P-Bote <I>masque partiellement</I> : </U></FONT>
-</P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">L'adresse
-I2P-Bote du destinataire n'est connue que par l'expéditeur et le(s)
-destinataire(s). </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">En cas de
-destinataires multiples, chacun verra tous les autres destinataires
-dont les adresses ont été indiquées en «&nbsp;A&nbsp;:» OU
-«&nbsp;Cc&nbsp;:&nbsp;».</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Toutes
-les entrées «&nbsp;Cci&nbsp;:&nbsp;» ne sont visibles qu'à
-l'expéditeur et au destinataire spécifique. </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Le moment
-de l'envoi, s'il est précisé, n'est visible que par l'expéditeur
-et le destinataire.</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR><FONT FACE="Arial, sans-serif"><U>Ce
-qu'I2P-Bote </U></FONT><FONT FACE="Arial, sans-serif"><I><U>peut
-masquer optionnellement </U></I></FONT><FONT FACE="Arial, sans-serif"><U>:
-</U></FONT>
-</P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif">- Si
-les routes de messagerie sont utilisées, le moment de l'envoi d'un
-message</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">- Si les
-routes de messagerie sont utilisées, le moment de relève d'un
-message [<FONT COLOR="#ff0000">pas encore implémenté</FONT>].</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">- Si
-l'expéditeur supprime les horodatages, seul l'expéditeur sait quand
-il a envoyé un message.</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR><FONT FACE="Arial, sans-serif"><U>Ce
-qu'I2P-Bote </U></FONT><FONT FACE="Arial, sans-serif"><I><U>ne peut
-pas cacher </U></I></FONT><FONT FACE="Arial, sans-serif"><U>: </U></FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><BR>I2P-Bote
-ne peut pas masquer la fréquence à laquelle une identité donnée
-relève les nouveaux messages, ni ne nombre de messages reçus par
-une identité donnée.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><BR>Pour
-son démarrage, I2P-Bote ne dépend pas non-plus d'un nœud central
-car il utilise Seedless.</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><B>5
-Terminologie/Glossaire:</B></FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><I><U>Identité
-du routeur/nœud I2P-Bote </U>:</I></FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">C'est
-l'identité par laquelle le routeur I2P-Bote est connu. Elle est
-utilisée pour contacter ce routeur, pour stocker, relayer et relever
-les messages, mais aussi pour le cryptage par saut et le contacter
-via I2P, car c'est celle là même de la destination du tunnel I2P.
-Elle est affichée pour représenter le nœud I2P-Bote dans les
-statistiques.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Ainsi
-donc, l'identité du routeur (I2P-Bote) correspond à la destination
-I2P (l'adresse d'un nœud I2P-Bote sur le réseau I2P – il n'y a
-pas de nécessité de la connaître, sauf en cas de problèmes de
-connexion aux autres nœuds I2P-Bote).</FONT></P>
-<P STYLE="font-weight: normal; line-height: 150%"><BR><FONT FACE="Arial, sans-serif"><I><U>Destination
-de messagerie I2P-Bote :</U></I></FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">La
-destination de messagerie I2P-Bote (clé) est un identifiant par
-lequel quelqu'un peut être atteint via I2P-Bote, comme son nom
-l'indique&nbsp;: une destination e-mail. C'est donc pour I2P-Bote ce
-qu'est une adresse e-mail pour un système de messagerie standard&nbsp;:
-la destination de messagerie est l'adresse effective d'envoi de
-messages, de stockage et de relève dans la DHT. <BR>Elle est aussi
-utilisée pour le cryptage de bout en bout des messages, pour les
-informations d'en-têtes et les pièces jointes. </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Une
-destination de messagerie I2P-Bote est une chaîne en base 64
-contenant une clé publique de cryptage et une clé de vérification
-de signature, par exemple&nbsp;: </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">uQtdwFHqbWHGyxZN8wChjWbCcgWrKuoBRNoziEpE8XDt8koHdJiskYXeUyq7JmpG</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">In8WKXY5LNue~62IXeZ-ppUYDdqi5V~9BZrcbpvgb5tjuu3ZRtHq9Vn6T9hOO1fa</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">FYZbK-FqHRiKm~lewFjSmfbBf1e6Fb~FLwQqUBTMtKYrRdO1d3xVIm2XXK83k1Da</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">-nufGASLaHJfsEkwMMDngg8uqRQmoj0THJb6vRfXzRw4qR5a0nj6dodeBfl2NgL9</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">HfOLInwrD67haJqjFJ8r~vVyOxRDJYFE8~f9b7k3N0YeyUK4RJSoiPXtTBLQ2RFQ</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">gOaKg4CuKHE0KCigBRU-Fhhc4weUzyU-g~rbTc2SWPlfvZ6n0voSvhvkZI9V52X3</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">SptDXk3fAEcwnC7lZzza6RNHurSMDMyOTmppAVz6BD8PB4o4RuWq7MQcnF9znElp</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">HX3Q10QdV3omVZJDNPxo-Wf~CpEd88C9ga4pS~QGIHSWtMPLFazeGeSHCnPzIRYD</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><BR>L'identité
-de routeur/nœud I2P-Bote et la destination de messagerie I2P-Bote se
-ressemblent mais elles sont complètement indépendantes l'une de
-l'autre.</FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif"><I><U>Adresse
-e-mail :</U></I></FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Les
-adresses e-mail dans I2P-Bote sont des raccourcis des destinations de
-messagerie.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Les
-correspondances entre elles sont stockées à deux endroits&nbsp;: le
-carnet d'adresses local et l'annuaire d'adresses décentralisé [<FONT COLOR="#ff0000">ce
-dernier n'est pas encore implémenté</FONT>].</FONT></P>
-<P STYLE="line-height: 150%"><BR><FONT FACE="Arial, sans-serif"><I><U>Identité
-de messagerie I2P-Bote :</U></I></FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">L'identité
-de messagerie I2P-Bote est un porte clé de destination de messagerie
-I2P-Bote avec la clé privée correspondante et le nom que lui a
-donné l'utilisateur qui l'a créé. Ce nom sera envoyé avec la clé
-de destination si vous ne désactivez pas l'envoi de cette
-information sur l'expéditeur.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Elle ne
-sera visible que par le destinataire s'il n'a pas déjà un nom pour
-cette destination dans son propre carnet d'adresses local.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Donc en
-termes techniques, une identité de messagerie est constituée de
-quatre éléments&nbsp;:</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">* une
-destination de messagerie (c'est à dire deux clés publiques)</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">* les
-deux clés privées correspondantes</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">* un nom
-public qui peut être montré aux correspondants</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">* une
-description qui n'est accessible qu'à vous même, le créateur
-l'identité.</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">(Pour
-vous aider à vous souvenir de l'usage que vous assignez à cette
-identité).</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Une
-identité n'est pas pas nécessaire pour envoyer des messages (dans
-ce cas, seul «&nbsp;Anonyme&nbsp;» est proposé comme expéditeur
-dans le champ de sélection).</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><I><U>Routes
-de messagerie </U></I>:</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Les
-routes de messagerie sont un mode de transport à haute latence
-supplémentaire pour I2P-Bote. Pour son fonctionnement, une chaîne
-de nœuds I2P-Bote est construite, agissant en tant que routeurs
-relais pour les paquets et obéissant à des retards par saut [<FONT COLOR="#ff0000">les
-retards individuels par saut ne sont pas encore implémentés</FONT>]&nbsp;;
-</FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><B><BR>AVERTISSEMENT!</B></FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Si vous
-choisissez cette option – particulièrement avec de nombreux sauts
-et/ou de longs retards, ne soyez pas surpris si vos messages
-n'arrivent pas rapidement à destination. Ça prendra évidemment
-plus de temps – jusqu'à plusieurs jours !</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><I><B>6.&nbsp;
-Remerciements</B></I></FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Idée &amp;
-conception technique : HungryHobo, Mixxy </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Implémentation
-: HungryHobo </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Maintenance
-du greffon : zzz, HungryHobo </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Interface
-utilisateur : HungryHobo </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Intégration
-de Seedless : sponge </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Traduction
-allemande : HungryHobo </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Traduction
-russe : suhr</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Traduction
-française : albat, Redzara, Mixxy, magma </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Traduction
-espagnole : Mixxy</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Traduction
-portugaise : Mixxy </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Traduction
-hollandaise : KwukDuck </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Traduction
-norvégienne : hej </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Traduction
-suédoise : hottuna</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Traduction
-chinoise : walking </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Traduction
-arabe : hamada </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Testeurs
-versions Alpha : HungryHobo, Mixxy, Returning Novice, sponge, et de
-nombreux autres. </FONT>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Manuel :
-Mixxy</FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">Testeurs
-versions Alpha : HungryHobo, Mixxy, Returning Novice, sponge, and
-many others</FONT></P>
-<P STYLE="line-height: 150%">Traduction française du manuel&nbsp;:
-magma (avril 2011) (grâce à l'aide inestimable de user pour la
-restitution correcte des concepts techniques et l'utilisation des
-outils techniques de l'équipe I2P).</P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><B>7.
-Détails techniques</B></FONT></P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif">-- voir
-techdoc.txt --</FONT></P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><BR><BR>
-</P>
-<P STYLE="line-height: 150%"><FONT FACE="Arial, sans-serif"><I><B>ENJOY
-THE BOTE FEELING!!</B></I></FONT></P>
-</BODY>
-</HTML>

WebContent/WEB-INF/lib/decrypt.bat

@@ -1,2 +0,0 @@
-REM This scrypt only works if I2P is installed in the standard directory
-@java -cp "%PROGRAMFILES%\\i2p\\lib\\i2p.jar;i2pbote.jar" i2p.bote.fileencryption.Decrypt %*

WebContent/WEB-INF/lib/decrypt.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-java -cp $I2P/lib/i2p.jar:`dirname $0`/i2pbote.jar i2p.bote.fileencryption.Decrypt $@

WebContent/WEB-INF/lib/encrypt.bat

@@ -1,2 +0,0 @@
-REM This scrypt only works if I2P is installed in the standard directory
-@java -cp "%PROGRAMFILES%\\i2p\\lib\\i2p.jar;i2pbote.jar" i2p.bote.fileencryption.Encrypt %*

WebContent/WEB-INF/lib/encrypt.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-java -cp $I2P/lib/i2p.jar:`dirname $0`/i2pbote.jar i2p.bote.fileencryption.Encrypt $@

WebContent/header.jsp

@@ -1,133 +0,0 @@
-<%--
- Copyright (C) 2009  HungryHobo@mail.i2p
- 
- The GPG fingerprint for HungryHobo@mail.i2p is:
- 6DD3 EAA2 9990 29BC 4AD2 7486 1E2C 7B61 76DC DC12
- 
- This file is part of I2P-Bote.
- I2P-Bote is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- 
- I2P-Bote is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
- --%>
-
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="ib" uri="I2pBoteTags" %>
-
-<%--
-    JSP variables that can be passed into this JSP:
-    
-        title           - The page title to set
-        refreshInterval - If this parameter is set, do an HTTP refresh every refreshInterval seconds
-        refreshUrl      - If refreshInterval is set, load this URL when refreshing
-        infoMessage     - Display an informational message
-        errorMessage    - Display an error message
-        
-    infoMessage and errorMessage can also be passed in as an HTTP parameter.
---%>
-
-<fmt:requestEncoding value="UTF-8"/>
-
-<jsp:useBean id="jspHelperBean" class="i2p.bote.web.JSPHelper"/>
-<c:set var="themeDir" value="themes/${jspHelperBean.configuration.theme}" scope="request"/>
-<fmt:setLocale value="${jspHelperBean.language}" scope="request"/>
-
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    
-    <%-- Refresh --%>
-    <c:if test="${not empty refreshInterval}">
-        <meta http-equiv="refresh" content="${refreshInterval};url=${refreshUrl}" />
-    </c:if>
-    
-    <link rel="stylesheet" href="themes/${jspHelperBean.configuration.theme}/i2pbote.css" />
-    <link rel="icon" type="image/png" href="${themeDir}/images/favicon.png" />
-    <c:if test="${!empty title}">
-        <title>${title} <ib:message key="- I2P-Bote"/></title>
-    </c:if>
-</head>
-
-<body>
-
-<div class="titlebar" onclick="document.location='.'">
-    <c:if test="${jspHelperBean.passwordInCache}">
-        <div class="password">
-            <ib:message key="Password is cached. Click to clear the password cache." var="linkTitle"/>
-            <a href="clearPasswordCache.jsp" title="${linkTitle}"><img src="${themeDir}/images/clear_password.png"/></a>
-        </div>
-    </c:if>
-    <div class="title"><ib:message key="I2P-Bote"/></div>
-    <br/>
-    <div class="subtitle"><ib:message key="Secure Distributed Email"/></div>
-</div>
-
-<c:if test="${jspHelperBean.updateAvailable}">
-<div class="updateMessage">
-    <a href="http://localhost:7657/configclients.jsp#plugin" target="_parent"><ib:message key="A new version is available. Click here for the configuration page."/></a>
-</div>
-</c:if>
-
-<div class="menubox">
-    <iframe src="buttonFrame.jsp" class="button-frame"></iframe>
-</div>
-
-<div class="menubox">
-    <iframe src="folders.jsp" class="folders-frame"></iframe>
-</div>
-
-<div class="menubox">
-    <h2><ib:message key="Addresses"/></h2>
-    <a href="identities.jsp"><ib:message key="Identities"/></a><br/>
-    <a href="addressBook.jsp"><ib:message key="Address Book"/></a><br/>
-    Public Address Directory<br/>
-</div>
-
-<div class="menubox">
-    <h2><ib:message key="Configuration"/></h2>
-    <a href="settings.jsp"><ib:message key="Settings"/></a><br/>
-</div>
-
-<div class="menubox">
-    <h2><a href="network.jsp"><ib:message key="Network Status"/></a></h2>
-    <iframe src="statusFrame.jsp" class="status-frame"></iframe>
-</div>
-
-<div class="menubox">
-    <h2><ib:message key="Help"/></h2>
-    <a href="${ib:getLocalizedFilename('User\'s Guide.html', pageContext.servletContext)}"><ib:message key="User Guide"/></a><br/>
-    <a href="${ib:getLocalizedFilename('FAQ.html', pageContext.servletContext)}"><ib:message key="FAQ"/></a><br/>
-    <a href="about.jsp"><ib:message key="About"/></a><br/>
-</div>
-
-<div class="infoMessage">
-    <c:if test="${not empty infoMessage}">
-        ${fn:escapeXml(infoMessage)}
-    </c:if>
-    <c:if test="${empty infoMessage}">
-        ${fn:escapeXml(param.infoMessage)}
-    </c:if>
-</div>
-
-<div class="errorMessage">
-    <c:if test="${not empty errorMessage}">
-        ${fn:escapeXml(errorMessage)}
-    </c:if>
-    <c:if test="${empty errorMessage}">
-        ${fn:escapeXml(param.errorMessage)}
-    </c:if>
-</div>

WebContent/setPassword.jsp

@@ -1,73 +0,0 @@
-<%--
- Copyright (C) 2009  HungryHobo@mail.i2p
- 
- The GPG fingerprint for HungryHobo@mail.i2p is:
- 6DD3 EAA2 9990 29BC 4AD2 7486 1E2C 7B61 76DC DC12
- 
- This file is part of I2P-Bote.
- I2P-Bote is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- 
- I2P-Bote is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
- --%>
-
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="ib" uri="I2pBoteTags" %>
-
-<ib:message key="Set Password" var="title" scope="request"/>
-<c:if test="${param.action eq 'set'}">
-    <c:set var="errorMessage" value="${ib:changePassword(param.old, param.new, param.confirm)}" scope="request"/>
-    <c:if test="${empty errorMessage}">
-        <ib:message key="The password has been changed." var="infoMessage" scope="request"/>
-        <jsp:forward page="index.jsp"/>
-    </c:if>
-</c:if>
-
-<jsp:include page="header.jsp"/>
-
-<div class="main">
-    <h2><ib:message key="Set a new Password"/></h2>
-    
-    <p>
-    <ib:message key="If you have not set a password, leave the old password blank."/>
-    </p><p>
-    <ib:message>
-        Please note that if a password is set, emails cannot be checked automatically
-        but only when the Check Mail button is clicked.
-    </ib:message>
-    </p><br/>
-    
-    <form name="form" action="setPassword.jsp" method="POST">
-        <input type="hidden" name="action" value="set"/>
-        
-        <div class="password-label"><ib:message key="Old password:"/></div>
-        <div class="password-field"><input type="password" name="old"/></div>
-        
-        <div class="password-label"><ib:message key="New password:"/></div>
-        <div class="password-field"><input type="password" name="new"/></div>
-        
-        <div class="password-label"><ib:message key="Confirm:"/></div>
-        <div class="password-field"><input type="password" name="confirm"/></div>
-        
-        <p/>
-        <ib:message key="OK" var="ok"/>
-        <input type="submit" value="${ok}"/>
-    </form>
-
-    <script type="text/javascript" language="JavaScript">
-        document.forms['form'].elements['old'].focus();
-    </script>
-</div>
-
-<jsp:include page="footer.jsp"/>

android/CHANGELOG

@@ -0,0 +1,56 @@
+0.7
+ * Address book import/export
+
+0.6 / 2015-06-21 / 77d67b4f2d465a5c528fb31af5785d176276b94b
+ * Identity switcher
+ * Language can be configured
+ * Block screenshots by default
+ * Fixed internal router
+ * Reorganized settings
+ * UI improvements, bug fixes, translation updates
+
+0.5 / 2015-01-13 / f5eaab42b6faa25450b2772315c7849f1eb4a03a
+ * Attachments!
+ * Email content can be selected/copied (API 11+)
+ * Cc: and Bcc: fields
+ * Improved performance of email and contact lists
+ * Use ripple effect on API 21+
+ * Much better support for legacy devices
+ * Help and About screens
+ * UI improvements, bug fixes, translation updates
+
+0.4 / 2014-12-19 / fdc9c619eff53745d49c987b353ce5b04278dfd6
+ * New email notifications!
+ * Fixed crash when clicking "Create new contact" button
+ * Fixed crash when sending email
+ * Fixed occasional crashes when Bote connects to / disconnects from the network
+ * Added "Copy to clipboard" button to identities and contacts
+ * Added labels to the address book actions menu
+ * UI improvements, bug fixes, translation updates
+
+0.3 / 2014-12-01 / ebba8aac78d50eda9d25f936e8bd348553966649
+ * Migrated to new Material design from Android Lollipop
+ * Overhauled password usability
+ * Identicons for contacts without pictures
+ * Use new-style swipe for checking emails
+ * Users can now check emails from menu, or swipe on empty inbox
+ * "Forward" and "Reply all" actions for emails
+ * QR codes for sharing identities
+ * Separated viewing and editing contacts
+ * Improved network information page
+ * Bug fixes, translation updates
+
+0.3-rc3 / 2014-08-23 / 6e7655836552d13d6fa6b7512e7dcf77cb3d413b
+ * Test release to Norway on Google Play
+
+0.2 / 2014-07-10 / 6c9c580bf6272db575091a1b48f66315535380e0
+ * Fixed locale hiding in replies
+ * New notification icons
+ * New translation
+ * UI improvements and bug fixes
+
+0.1.1 / 2014-06-20 / a9c83d573dc3c5fbeeb288b347f996f440b33621
+ * Fixed bugs in identity creation and password setting
+
+0.1 / 2014-06-19 / 8457f58f367a2f362bdacd470c792b4bcd6d42f6
+ * Initial release

android/TODO

@@ -0,0 +1,70 @@
+Fixes:
+- Auto-comma the To: field when it loses focus
+- Fix tick over selected emails
+- Delete/read/unread/move actions on view email page that don't break everything
+- Prevent router option being changed while Bote is running
+- Remove internal router
+
+Tasks:
+- Show logged-in status in persistent notification
+- Intro and setup
+  - More layouts (tune for each screen size)
+- Subclass EmailListFragment for each default mailbox
+- First-run content of inbox should tell users about pull-to-refresh.
+- Cache Identicons for speed
+- Refactor code
+  - Reorganize for clarity
+  - Optimize use of Android lifecycles
+
+Silent Store approval checks to confirm/implement:
+- Known Vulnerabilities
+  - Apps will be tested to ensure that they are not susceptible to known
+    publicly disclosed vulnerabilities. For example:
+    - Heartbleed
+    - Poodle
+    - MasterKey
+    - Common Path Traversal attacks
+    - Common SQL Injection attacks
+- Network Security Protocols
+  - All Apps that require transmission of data from the App to a system that
+    does not exist on the device must use, at a minimum, TLS1.1 standards.
+    However, Blackphone would prefer the usage of TLS1.2.
+  - Apps must not use algorithms for cryptographic purposes that are considered
+    obsolete or outdated i.e. MD5, SHA1, RC4, DES, or any encryption algorithm
+    that is weaker than AES128.
+- Transport Layer Protection
+  - All network communication should be encrypted
+  - Not vulnerable to SSl Strip
+- Data Leakage
+  - No storage of sensitive data outside of application sandbox
+  - Files should not be created with MODE_WORLD_READABLE or MODE_WORLD_WRITABLE
+  - Copy & Paste will be evaluated on a case by case basis
+  - App logs should not contain sensitive information
+- Authentication and Authorization
+  - Validate that authentication credentials are not stored on the device
+  - Must use an approved password-based key derivation function ie. PBKDF2, scrypt
+- Data-at-rest Encryption
+  - Must use at a minimum AES128 with modes CCM or GCM
+  - Should not store the encryption key on the file system
+- Permission Checks
+  - The App must function with all permissions disabled
+  - Apps must not hard crash if a permission is disabled
+  - Apps should ask users to enable permissions that are disabled if needed to
+    function properly and explain why the permission is necessary
+- Privacy Policy
+  - Apps must have a privacy policy that details how customer data is used,
+    stored, shared, etc...
+  - Apps must be configured with the customer opted out by default
+  - App logs should not contain PII
+- Error Handling
+  - Apps should follow best-practices for error handling and logging
+
+Features:
+- Search
+- Fingerprints that users can compare to validate
+- Public address book lookup
+- "Write email" link in address book
+- "Empty trash" option in Trash folder
+- Overlay to explain
+- Option to run only when connected to an outlet
+- Option to run only when connected to wifi

android/art/bote-feature.svg

@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1024"
+   height="500"
+   id="svg3027"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="bote-feature.svg">
+  <defs
+     id="defs3029">
+    <linearGradient
+       gradientTransform="matrix(1.4585784,0,0,1.4585784,-198.10585,-178.10619)"
+       y2="481.5072"
+       x2="523.5882"
+       y1="481.5072"
+       x1="340.4118"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6049"
+       xlink:href="#linearGradient3903"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3903-0">
+      <stop
+         id="stop3905-0"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.17647059;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="0.25018752"
+         id="stop3915-03" />
+      <stop
+         id="stop3919-2"
+         offset="0.50031251"
+         style="stop-color:#000000;stop-opacity:0.05882353;" />
+      <stop
+         id="stop3917-29"
+         offset="0.75"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         id="stop3907-6"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.17647059;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="481.5072"
+       x2="523.5882"
+       y1="481.5072"
+       x1="340.4118"
+       id="linearGradient5962-5"
+       xlink:href="#linearGradient3903-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3903-3-2">
+      <stop
+         id="stop3905-2-3"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.15686275;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.05882353;"
+         offset="0.2"
+         id="stop3915-0-3" />
+      <stop
+         id="stop3919-4-8"
+         offset="0.50031251"
+         style="stop-color:#000000;stop-opacity:0.01960784;" />
+      <stop
+         id="stop3917-2-6"
+         offset="0.80000001"
+         style="stop-color:#000000;stop-opacity:0.05882353;" />
+      <stop
+         id="stop3907-9-6"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.15686275;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1.4585784,0,0,1.4585784,-198.10585,-178.10619)"
+       gradientUnits="userSpaceOnUse"
+       y2="342.44925"
+       x2="500.96887"
+       y1="342.44925"
+       x1="363.03113"
+       id="linearGradient5942"
+       xlink:href="#linearGradient3903-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3903-3">
+      <stop
+         id="stop3905-2"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.17647059;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="0.25018752"
+         id="stop3915-0" />
+      <stop
+         id="stop3919-4"
+         offset="0.50031251"
+         style="stop-color:#000000;stop-opacity:0.05882353;" />
+      <stop
+         id="stop3917-2"
+         offset="0.75"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         id="stop3907-9"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.17647059;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.99875033,0,0,0.99826344,0.53986459,0.7502204)"
+       gradientUnits="userSpaceOnUse"
+       y2="432.00003"
+       x2="832"
+       y1="432.00003"
+       x1="32.000004"
+       id="linearGradient3911-5"
+       xlink:href="#linearGradient3903-3"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective3012"
+       inkscape:persp3d-origin="432 : 288 : 1"
+       inkscape:vp_z="1566.8571 : 394.85714 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="-291.42857 : 94.857143 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient3903">
+      <stop
+         id="stop3905"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.17647059;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="0.25018752"
+         id="stop3915" />
+      <stop
+         id="stop3919"
+         offset="0.50031251"
+         style="stop-color:#000000;stop-opacity:0.05882353;" />
+      <stop
+         id="stop3917"
+         offset="0.75"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         id="stop3907"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.17647059;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5944">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="0"
+         id="stop5952" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="1"
+         id="stop5954" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903-3-2"
+       id="linearGradient3248"
+       gradientUnits="userSpaceOnUse"
+       x1="23"
+       y1="431"
+       x2="841"
+       y2="431" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903-3-2"
+       id="linearGradient3250"
+       gradientUnits="userSpaceOnUse"
+       x1="267"
+       y1="522"
+       x2="597"
+       y2="522" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903-0"
+       id="radialGradient3252"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.72727297,0,73.499943)"
+       cx="430.75"
+       cy="269.50003"
+       fx="430.75"
+       fy="269.50003"
+       r="123.75" />
+    <filter
+       id="filter3854"
+       y="-0.15"
+       height="1.3"
+       x="-0.15"
+       width="1.3"
+       inkscape:menu-tooltip="Aquarelle paper effect which can be used for pictures as for objects"
+       inkscape:menu="Textures"
+       inkscape:label="Rough paper"
+       color-interpolation-filters="sRGB">
+      <feTurbulence
+         id="feTurbulence3856"
+         type="fractalNoise"
+         baseFrequency="0.04"
+         numOctaves="5"
+         seed="0"
+         result="result4" />
+      <feDisplacementMap
+         id="feDisplacementMap3858"
+         in2="result4"
+         in="SourceGraphic"
+         yChannelSelector="G"
+         xChannelSelector="R"
+         scale="10"
+         result="result3" />
+      <feDiffuseLighting
+         id="feDiffuseLighting3860"
+         lighting-color="rgb(233,230,215)"
+         diffuseConstant="1"
+         surfaceScale="2"
+         result="result1"
+         in="result4">
+        <feDistantLight
+           id="feDistantLight3862"
+           azimuth="235"
+           elevation="40" />
+      </feDiffuseLighting>
+      <feComposite
+         id="feComposite3864"
+         in2="result1"
+         operator="in"
+         in="result3"
+         result="result2" />
+      <feComposite
+         id="feComposite3866"
+         in2="result1"
+         result="result5"
+         operator="arithmetic"
+         k1="1.7" />
+      <feBlend
+         id="feBlend3868"
+         in2="result3"
+         in="result5"
+         mode="normal" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.5"
+     inkscape:cx="351.48063"
+     inkscape:cy="250"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="719"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3032">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Background"
+     style="opacity:0.3">
+    <rect
+       style="fill:#ffffde;fill-opacity:0.87058824000000001;fill-rule:nonzero;stroke:none;filter:url(#filter3854)"
+       id="rect3032"
+       width="1124"
+       height="600"
+       x="-50"
+       y="-50" />
+  </g>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-552.36218)">
+    <g
+       id="g3224"
+       transform="matrix(0.40342298,0,0,0.40342298,91.309473,628.48688)">
+      <g
+         style="display:inline"
+         inkscape:label="Bg"
+         id="layer3">
+        <rect
+           y="145.99701"
+           x="32"
+           height="574.00299"
+           width="798.00293"
+           id="rect2994-9"
+           style="fill:#fafae6;fill-opacity:1;stroke:none;display:inline" />
+      </g>
+      <g
+         style="display:inline"
+         inkscape:label="Envelope"
+         id="layer1-6">
+        <rect
+           y="142"
+           x="32"
+           height="578"
+           width="800"
+           id="rect2994"
+           style="fill:url(#linearGradient3248);fill-opacity:1;stroke:#000000;stroke-width:18;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0"
+           d="M 32.99995,144.99995 431.99998,479.00212 831.00005,144.99995 M 375.41474,431.99882 33.000566,719.00005 m 797.998874,0 -342.41418,-287.00123"
+           style="fill:none;stroke:#000000;stroke-width:17.99989891;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-9" />
+      </g>
+      <g
+         style="display:inline"
+         id="g6041"
+         inkscape:label="Lock bg">
+        <path
+           inkscape:connector-curvature="0"
+           id="path6043"
+           d="m 267,359.5 0,325 330,0 0,-325 -330,0 z M 432,418 c 29.82337,0 54,24.17661 54,54 0,19.98456 -10.86345,37.41209 -27,46.75 l 0,107.25 -54,0 0,-107.25 c -16.13656,-9.33791 -27,-26.76544 -27,-46.75 0,-29.82339 24.17662,-54 54,-54 z"
+           style="fill:#ffda00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:8.89999962;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           style="fill:#faffff;fill-opacity:1;stroke:#000000;stroke-width:9;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 369.75735,359.49999 0,-57.36595 c 0.21395,-6.69058 1.48284,-13.34882 3.92587,-19.62604 8.34674,-22.92119 31.23869,-39.42587 55.47413,-39.71118 0.75084,-0.0301 1.52631,-0.0581 2.27586,-0.0572 23.23569,0.0265 45.61943,14.77505 54.96208,36.26801 3.26038,7.2537 5.06733,15.16666 5.34827,23.12659 l 0,57.36584 M 554.5,359.5 554.49909,302.13415 C 553.31086,234.20574 498.38227,179.5 430.74976,179.5 363.11725,179.5 308.18822,234.20574 307,302.13405 L 307,359.5"
+           id="path6045"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccscc" />
+      </g>
+      <g
+         inkscape:label="Lock"
+         id="g4234"
+         style="display:inline">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3250);fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="m 267,359.5 0,325 330,0 0,-325 -330,0 z M 432,418 c 29.82337,0 54,24.17661 54,54 0,19.98456 -10.86345,37.41209 -27,46.75 l 0,107.25 -54,0 0,-107.25 c -16.13656,-9.33791 -27,-26.76544 -27,-46.75 0,-29.82339 24.17662,-54 54,-54 z"
+           id="path4236" />
+        <path
+           sodipodi:nodetypes="ccccccccccscc"
+           inkscape:connector-curvature="0"
+           id="path4238"
+           d="m 369.75735,359.49999 0,-57.36595 c 0.21395,-6.69058 1.48284,-13.34882 3.92587,-19.62604 8.34674,-22.92119 31.23869,-39.42587 55.47413,-39.71118 0.75084,-0.0301 1.52631,-0.0581 2.27586,-0.0572 23.23569,0.0265 45.61943,14.77505 54.96208,36.26801 3.26038,7.2537 5.06733,15.16666 5.34827,23.12659 l 0,57.36584 M 554.5,359.5 554.49909,302.13415 C 553.31086,234.20574 498.38227,179.5 430.74976,179.5 363.11725,179.5 308.18822,234.20574 307,302.13405 L 307,359.5"
+           style="fill:url(#radialGradient3252);fill-opacity:1;stroke:none" />
+      </g>
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Webdings;-inkscape-font-specification:Webdings"
+       x="497.5329"
+       y="863.97107"
+       id="text3273"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="497.5329"
+         y="863.97107"
+         style="font-size:175px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+         id="tspan3277">Bote.</tspan></text>
+  </g>
+</svg>

android/art/ic_launcher_master.svg

@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="864"
+   height="864"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ic_launcher_master.svg">`
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5944">
+      <stop
+         id="stop5952"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         id="stop5954"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3903">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="0"
+         id="stop3905" />
+      <stop
+         id="stop3915"
+         offset="0.25018752"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.05882353;"
+         offset="0.50031251"
+         id="stop3919" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="0.75"
+         id="stop3917" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="1"
+         id="stop3907" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-291.42857 : 94.857143 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1566.8571 : 394.85714 : 1"
+       inkscape:persp3d-origin="432 : 288 : 1"
+       id="perspective3012" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903-3"
+       id="linearGradient3911-5"
+       x1="32.000004"
+       y1="432.00003"
+       x2="832"
+       y2="432.00003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99875033,0,0,0.99826344,0.53986459,0.7502204)" />
+    <linearGradient
+       id="linearGradient3903-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="0"
+         id="stop3905-2" />
+      <stop
+         id="stop3915-0"
+         offset="0.25018752"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.05882353;"
+         offset="0.50031251"
+         id="stop3919-4" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="0.75"
+         id="stop3917-2" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="1"
+         id="stop3907-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903-3"
+       id="linearGradient5942"
+       x1="363.03113"
+       y1="342.44925"
+       x2="500.96887"
+       y2="342.44925"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4585784,0,0,1.4585784,-198.10585,-178.10619)" />
+    <linearGradient
+       id="linearGradient3903-3-2">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15686275;"
+         offset="0"
+         id="stop3905-2-3" />
+      <stop
+         id="stop3915-0-3"
+         offset="0.2"
+         style="stop-color:#000000;stop-opacity:0.05882353;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.01960784;"
+         offset="0.50031251"
+         id="stop3919-4-8" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.05882353;"
+         offset="0.80000001"
+         id="stop3917-2-6" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.15686275;"
+         offset="1"
+         id="stop3907-9-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903-0"
+       id="linearGradient5962-5"
+       x1="340.4118"
+       y1="481.5072"
+       x2="523.5882"
+       y2="481.5072"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3903-0">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="0"
+         id="stop3905-0" />
+      <stop
+         id="stop3915-03"
+         offset="0.25018752"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.05882353;"
+         offset="0.50031251"
+         id="stop3919-2" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="0.75"
+         id="stop3917-29" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="1"
+         id="stop3907-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903"
+       id="linearGradient6049"
+       gradientUnits="userSpaceOnUse"
+       x1="340.4118"
+       y1="481.5072"
+       x2="523.5882"
+       y2="481.5072"
+       gradientTransform="matrix(1.4585784,0,0,1.4585784,-198.10585,-178.10619)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903-3-2"
+       id="linearGradient4246"
+       x1="23"
+       y1="431"
+       x2="841"
+       y2="431"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903-3-2"
+       id="linearGradient4254"
+       x1="267"
+       y1="522"
+       x2="597"
+       y2="522"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903-0"
+       id="radialGradient4266"
+       cx="430.75"
+       cy="269.50003"
+       fx="430.75"
+       fy="269.50003"
+       r="123.75"
+       gradientTransform="matrix(1,0,0,0.72727297,0,73.499943)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.70710678"
+     inkscape:cx="355.79427"
+     inkscape:cy="460.20102"
+     inkscape:document-units="px"
+     inkscape:current-layer="g6041"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="719"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Bg"
+     style="display:inline">
+    <rect
+       style="fill:#fafae6;fill-opacity:1;stroke:none;display:inline"
+       id="rect2994-9"
+       width="798.00293"
+       height="574.00299"
+       x="32"
+       y="145.99701" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Envelope"
+     style="display:inline;opacity:1">
+    <rect
+       style="fill:url(#linearGradient4246);fill-opacity:1.0;stroke:#000000;stroke-width:18;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect2994"
+       width="800"
+       height="578"
+       x="32"
+       y="142" />
+    <path
+       id="path3044-9"
+       style="fill:none;stroke:#000000;stroke-width:17.99989890999999886;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 32.99995,144.99995 431.99998,479.00212 831.00005,144.99995 M 375.41474,431.99882 33.000566,719.00005 m 797.998874,0 -342.41418,-287.00123"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+  <g
+     inkscape:label="Lock bg"
+     id="g6041"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       style="fill:#ffda00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-opacity:1;stroke-width:8.9;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 267,359.5 0,325 330,0 0,-325 -330,0 z M 432,418 c 29.82337,0 54,24.17661 54,54 0,19.98456 -10.86345,37.41209 -27,46.75 l 0,107.25 -54,0 0,-107.25 c -16.13656,-9.33791 -27,-26.76544 -27,-46.75 0,-29.82339 24.17662,-54 54,-54 z"
+       id="path6043"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccccccccscc"
+       inkscape:connector-curvature="0"
+       id="path6045"
+       d="m 369.75735,359.49999 0,-57.36595 c 0.21395,-6.69058 1.48284,-13.34882 3.92587,-19.62604 8.34674,-22.92119 31.23869,-39.42587 55.47413,-39.71118 0.75084,-0.0301 1.52631,-0.0581 2.27586,-0.0572 23.23569,0.0265 45.61943,14.77505 54.96208,36.26801 3.26038,7.2537 5.06733,15.16666 5.34827,23.12659 l 0,57.36584 M 554.5,359.5 554.49909,302.13415 C 553.31086,234.20574 498.38227,179.5 430.74976,179.5 363.11725,179.5 308.18822,234.20574 307,302.13405 L 307,359.5"
+       style="fill:#faffff;fill-opacity:1;stroke:#000000;stroke-width:9;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     id="g4234"
+     inkscape:label="Lock">
+    <path
+       id="path4236"
+       d="m 267,359.5 0,325 330,0 0,-325 -330,0 z M 432,418 c 29.82337,0 54,24.17661 54,54 0,19.98456 -10.86345,37.41209 -27,46.75 l 0,107.25 -54,0 0,-107.25 c -16.13656,-9.33791 -27,-26.76544 -27,-46.75 0,-29.82339 24.17662,-54 54,-54 z"
+       style="fill:url(#linearGradient4254);fill-opacity:1;fill-rule:nonzero;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#radialGradient4266);fill-opacity:1;stroke:none"
+       d="m 369.75735,359.49999 0,-57.36595 c 0.21395,-6.69058 1.48284,-13.34882 3.92587,-19.62604 8.34674,-22.92119 31.23869,-39.42587 55.47413,-39.71118 0.75084,-0.0301 1.52631,-0.0581 2.27586,-0.0572 23.23569,0.0265 45.61943,14.77505 54.96208,36.26801 3.26038,7.2537 5.06733,15.16666 5.34827,23.12659 l 0,57.36584 M 554.5,359.5 554.49909,302.13415 C 553.31086,234.20574 498.38227,179.5 430.74976,179.5 363.11725,179.5 308.18822,234.20574 307,302.13405 L 307,359.5"
+       id="path4238"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccscc" />
+  </g>
+</svg>

android/art/ic_notif_master.svg

@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="864"
+   height="864"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ic_notif_master.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5944">
+      <stop
+         id="stop5952"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         id="stop5954"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3903">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="0"
+         id="stop3905" />
+      <stop
+         id="stop3915"
+         offset="0.25018752"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.05882353;"
+         offset="0.50031251"
+         id="stop3919" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="0.75"
+         id="stop3917" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="1"
+         id="stop3907" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-291.42857 : 94.857143 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1566.8571 : 394.85714 : 1"
+       inkscape:persp3d-origin="432 : 288 : 1"
+       id="perspective3012" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903-3"
+       id="linearGradient3911-5"
+       x1="32.000004"
+       y1="432.00003"
+       x2="832"
+       y2="432.00003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99875033,0,0,0.99826344,0.53986459,0.7502204)" />
+    <linearGradient
+       id="linearGradient3903-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="0"
+         id="stop3905-2" />
+      <stop
+         id="stop3915-0"
+         offset="0.25018752"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.05882353;"
+         offset="0.50031251"
+         id="stop3919-4" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="0.75"
+         id="stop3917-2" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="1"
+         id="stop3907-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903-3"
+       id="linearGradient5942"
+       x1="363.03113"
+       y1="342.44925"
+       x2="500.96887"
+       y2="342.44925"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4585784,0,0,1.4585784,-198.10585,-178.10619)" />
+    <linearGradient
+       id="linearGradient3903-3-2">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="0"
+         id="stop3905-2-3" />
+      <stop
+         id="stop3915-0-3"
+         offset="0.25018752"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.05882353;"
+         offset="0.50031251"
+         id="stop3919-4-8" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="0.75"
+         id="stop3917-2-6" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="1"
+         id="stop3907-9-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903-0"
+       id="linearGradient5962-5"
+       x1="340.4118"
+       y1="481.5072"
+       x2="523.5882"
+       y2="481.5072"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3903-0">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="0"
+         id="stop3905-0" />
+      <stop
+         id="stop3915-03"
+         offset="0.25018752"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.05882353;"
+         offset="0.50031251"
+         id="stop3919-2" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="0.75"
+         id="stop3917-29" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="1"
+         id="stop3907-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903"
+       id="linearGradient6049"
+       gradientUnits="userSpaceOnUse"
+       x1="340.4118"
+       y1="481.5072"
+       x2="523.5882"
+       y2="481.5072"
+       gradientTransform="matrix(1.4585784,0,0,1.4585784,-198.10585,-178.10619)" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4056">
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:none;display:inline"
+         d="M 57.46875,142 307,350.875 l 0,-56.25 C 308.18822,226.69669 363.11749,172 430.75,172 c 67.63251,0 122.56177,54.69659 123.75,122.625 l 0,57.375 1.15625,0 250.875,-210 -749.0625,0 z M 32,167.65625 32,696.375 267,499.40625 267,364.375 32,167.65625 z m 800,0 L 597,364.375 597,499.40625 832,696.375 832,167.65625 z M 431.4375,235.25 c -0.74955,-0.001 -1.53041,0.001 -2.28125,0.0312 -24.23544,0.28531 -47.12201,16.79756 -55.46875,39.71875 -2.44303,6.27722 -3.72355,12.93442 -3.9375,19.625 l 0,57.375 122,0 0,-57.375 c -0.28094,-7.95993 -2.08337,-15.8713 -5.34375,-23.125 -9.34265,-21.49296 -31.73306,-36.2235 -54.96875,-36.25 z M 432,404.5 c -34.79394,0 -63,28.20605 -63,63 0,21.40237 10.6868,40.3019 27,51.6875 l 0,120.3125 72,0 0,-120.3125 c 16.31319,-11.3856 27,-30.28513 27,-51.6875 0,-34.79395 -28.20607,-63 -63,-63 z M 267,546.34375 59.8125,720 804.1875,720 597,546.34375 597,692 l -330,0 0,-145.65625 z"
+         id="path4058"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.5"
+     inkscape:cx="659.75749"
+     inkscape:cy="504.31379"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="719"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Bg"
+     style="display:none" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Envelope"
+     style="display:inline">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect2994"
+       width="800"
+       height="578"
+       x="32"
+       y="142"
+       clip-path="url(#clipPath4056)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Chain"
+     style="display:none" />
+  <g
+     inkscape:label="Lock bg"
+     id="g6041"
+     inkscape:groupmode="layer"
+     style="display:inline" />
+</svg>

android/art/ic_notif_premaster.svg

@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="864"
+   height="864"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ic_notif_premaster.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5944">
+      <stop
+         id="stop5952"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         id="stop5954"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3903">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="0"
+         id="stop3905" />
+      <stop
+         id="stop3915"
+         offset="0.25018752"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.05882353;"
+         offset="0.50031251"
+         id="stop3919" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="0.75"
+         id="stop3917" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="1"
+         id="stop3907" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-291.42857 : 94.857143 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1566.8571 : 394.85714 : 1"
+       inkscape:persp3d-origin="432 : 288 : 1"
+       id="perspective3012" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903-3"
+       id="linearGradient3911-5"
+       x1="32.000004"
+       y1="432.00003"
+       x2="832"
+       y2="432.00003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99875033,0,0,0.99826344,0.53986459,0.7502204)" />
+    <linearGradient
+       id="linearGradient3903-3">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="0"
+         id="stop3905-2" />
+      <stop
+         id="stop3915-0"
+         offset="0.25018752"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.05882353;"
+         offset="0.50031251"
+         id="stop3919-4" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="0.75"
+         id="stop3917-2" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="1"
+         id="stop3907-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903-3"
+       id="linearGradient5942"
+       x1="363.03113"
+       y1="342.44925"
+       x2="500.96887"
+       y2="342.44925"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4585784,0,0,1.4585784,-198.10585,-178.10619)" />
+    <linearGradient
+       id="linearGradient3903-3-2">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="0"
+         id="stop3905-2-3" />
+      <stop
+         id="stop3915-0-3"
+         offset="0.25018752"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.05882353;"
+         offset="0.50031251"
+         id="stop3919-4-8" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="0.75"
+         id="stop3917-2-6" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="1"
+         id="stop3907-9-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903-0"
+       id="linearGradient5962-5"
+       x1="340.4118"
+       y1="481.5072"
+       x2="523.5882"
+       y2="481.5072"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3903-0">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="0"
+         id="stop3905-0" />
+      <stop
+         id="stop3915-03"
+         offset="0.25018752"
+         style="stop-color:#000000;stop-opacity:0.09803922;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.05882353;"
+         offset="0.50031251"
+         id="stop3919-2" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.09803922;"
+         offset="0.75"
+         id="stop3917-29" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.17647059;"
+         offset="1"
+         id="stop3907-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3903"
+       id="linearGradient6049"
+       gradientUnits="userSpaceOnUse"
+       x1="340.4118"
+       y1="481.5072"
+       x2="523.5882"
+       y2="481.5072"
+       gradientTransform="matrix(1.4585784,0,0,1.4585784,-198.10585,-178.10619)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.5"
+     inkscape:cx="312.75749"
+     inkscape:cy="504.31379"
+     inkscape:document-units="px"
+     inkscape:current-layer="g6041"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="719"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Bg"
+     style="display:inline">
+    <rect
+       style="fill:#fafae6;fill-opacity:1;stroke:none;display:inline"
+       id="rect2994-9"
+       width="798.00293"
+       height="574.00299"
+       x="32"
+       y="145.99701" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Envelope"
+     style="display:inline">
+    <rect
+       style="fill:#b3b3b3;fill-opacity:1;stroke:none"
+       id="rect2994"
+       width="800"
+       height="578"
+       x="32"
+       y="142" />
+    <path
+       id="path3044-9"
+       style="fill:none;stroke:#000000;stroke-width:36;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 32.99995,144.99995 431.99998,479.00212 831.00005,144.99995 M 375.41474,431.99882 33.000566,719.00005 m 797.998874,0 -342.41418,-287.00123"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Chain"
+     style="display:none" />
+  <g
+     inkscape:label="Lock bg"
+     id="g6041"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <path
+       id="path6043"
+       d="m 267,352.00003 0,340 330,0 0,-340 -330,0 z m 165,80.54046 c 20.333,0 36.82476,17.28664 36.82476,38.59975 0,17.02222 -10.50755,31.44372 -25.10002,36.57132 l 0,103.74803 -23.44948,0 0,-103.74803 c -14.57211,-5.13964 -25.10002,-19.5643 -25.10002,-36.57131 0,-21.31312 16.49176,-38.59976 36.82476,-38.59976 z"
+       style="fill:#ffda00;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccccccccscc"
+       inkscape:connector-curvature="0"
+       id="path6045"
+       d="m 369.75735,351.99996 0,-57.36595 c 0.21395,-6.69058 1.48284,-13.34882 3.92587,-19.62604 8.34674,-22.92119 31.23869,-39.42587 55.47413,-39.71118 0.75084,-0.0301 1.52631,-0.0581 2.27586,-0.0572 23.23569,0.0265 45.61943,14.77505 54.96208,36.26801 3.26038,7.2537 5.06733,15.16666 5.34827,23.12659 l 0,57.36584 m 62.75644,-6e-5 -9.1e-4,-57.36585 C 553.31086,226.70571 498.38227,171.99997 430.74976,171.99997 363.11725,171.99997 308.18822,226.70571 307,294.63402 l 0,57.36595"
+       style="fill:#faffff;fill-opacity:1;stroke:none" />
+    <path
+       id="rect3796"
+       style="fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 396,511.50001 72,0 0,128 -72,0 z m 99,-43.99996 c 0,34.79393 -28.20606,62.99999 -62.99999,62.99999 -34.79394,0 -63.00001,-28.20606 -63.00001,-62.99999 0,-34.79395 28.20607,-63.00001 63.00001,-63.00001 34.79393,0 62.99999,28.20606 62.99999,63.00001 z"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

android/art/icons/ic_scan_qr_code_24px.svg

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ic_scan_qr_code_24px.svg">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="719"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="22.583333"
+     inkscape:cx="6.0442804"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer2" />
+  <path
+     d="M0 0h24v24h-24z"
+     fill="none"
+     id="path8" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Camera"
+     style="display:inline">
+    <path
+       d="M 8 6.09375 C 6.9396133 6.09375 6.09375 6.9396133 6.09375 8 C 6.09375 9.0603867 6.9396133 9.90625 8 9.90625 L 8 8 L 9.90625 8 C 9.90625 6.9396133 9.0603867 6.09375 8 6.09375 z "
+       id="circle4-5"
+       style="fill:#000000" />
+    <path
+       d="M 6.1875 2 L 5.09375 3.1875 L 3.1875 3.1875 C 2.5275 3.1875 2 3.74625 2 4.40625 L 2 11.59375 C 2 12.25375 2.5275 12.8125 3.1875 12.8125 L 8 12.8125 L 8 11 C 6.344 11 5 9.656 5 8 C 5 6.344 6.344 5 8 5 C 9.656 5 11 6.344 11 8 L 14 8 L 14 4.40625 C 14 3.74625 13.4725 3.1875 12.8125 3.1875 L 10.90625 3.1875 L 9.8125 2 L 6.1875 2 z "
+       id="path6-5"
+       style="fill:#000000" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="QR Code"
+     style="display:inline">
+    <path
+       style="fill:#000000;stroke:none"
+       d="m 8.625,8.625 0,4.46875 4.46875,0 0,-4.46875 -4.46875,0 z m 6.34375,0 0,0.65625 0.65625,0 0,-0.65625 -0.65625,0 z m 1.28125,0 0,1.28125 0.625,0 0,-1.28125 -0.625,0 z m 1.28125,0 0,4.46875 4.4375,0 0,-4.46875 -4.4375,0 z m -8.25,0.65625 3.15625,0 0,3.15625 -3.15625,0 0,-3.15625 z m 8.875,0 3.1875,0 0,3.15625 -3.1875,0 0,-3.15625 z"
+       id="path6"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000000;stroke:none"
+       d="M 9.90625 9.90625 L 9.90625 11.8125 L 11.8125 11.8125 L 11.8125 9.90625 L 9.90625 9.90625 z M 13.71875 9.90625 L 13.71875 10.53125 L 14.34375 10.53125 L 14.34375 9.90625 L 13.71875 9.90625 z M 14.96875 9.90625 L 14.96875 10.53125 L 15.625 10.53125 L 15.625 9.90625 L 14.96875 9.90625 z M 18.78125 9.90625 L 18.78125 11.8125 L 20.6875 11.8125 L 20.6875 9.90625 L 18.78125 9.90625 z M 16.25 10.53125 L 16.25 11.1875 L 15.625 11.1875 L 15.625 11.8125 L 14.96875 11.8125 L 14.96875 11.1875 L 14.34375 11.1875 L 14.34375 12.4375 L 14.96875 12.4375 L 14.96875 14.34375 L 15.625 14.34375 L 15.625 12.4375 L 16.25 12.4375 L 16.25 11.8125 L 16.875 11.8125 L 16.875 10.53125 L 16.25 10.53125 z M 16.25 12.4375 L 16.25 13.09375 L 16.875 13.09375 L 16.875 12.4375 L 16.25 12.4375 z M 15.625 14.34375 L 15.625 15.625 L 14.96875 15.625 L 14.96875 16.25 L 15.625 16.25 L 15.625 16.875 L 13.71875 16.875 L 13.71875 19.4375 L 14.34375 19.4375 L 14.34375 20.0625 L 13.71875 20.0625 L 13.71875 21.96875 L 14.34375 21.96875 L 14.34375 21.34375 L 14.96875 21.34375 L 14.96875 20.0625 L 15.625 20.0625 L 15.625 21.96875 L 16.875 21.96875 L 16.875 21.34375 L 16.25 21.34375 L 16.25 20.6875 L 17.53125 20.6875 L 17.53125 20.0625 L 16.875 20.0625 L 16.875 18.78125 L 15.625 18.78125 L 15.625 19.4375 L 14.96875 19.4375 L 14.96875 18.78125 L 14.34375 18.78125 L 14.34375 18.15625 L 15.625 18.15625 L 15.625 17.53125 L 16.25 17.53125 L 16.25 16.25 L 16.875 16.25 L 16.875 15.625 L 16.25 15.625 L 16.25 14.34375 L 15.625 14.34375 z M 16.25 14.34375 L 16.875 14.34375 L 16.875 14.96875 L 17.53125 14.96875 L 17.53125 14.34375 L 18.15625 14.34375 L 18.15625 13.71875 L 16.25 13.71875 L 16.25 14.34375 z M 18.15625 14.34375 L 18.15625 14.96875 L 18.78125 14.96875 L 18.78125 15.625 L 18.15625 15.625 L 18.15625 16.25 L 18.78125 16.25 L 18.78125 16.875 L 19.4375 16.875 L 19.4375 15.625 L 20.0625 15.625 L 20.0625 14.34375 L 18.15625 14.34375 z M 20.0625 14.34375 L 20.6875 14.34375 L 20.6875 13.71875 L 20.0625 13.71875 L 20.0625 14.34375 z M 20.6875 14.34375 L 20.6875 15.625 L 21.34375 15.625 L 21.34375 16.875 L 21.96875 16.875 L 21.96875 14.34375 L 20.6875 14.34375 z M 19.4375 16.875 L 19.4375 17.53125 L 18.15625 17.53125 L 18.15625 18.15625 L 20.6875 18.15625 L 20.6875 19.4375 L 20.0625 19.4375 L 20.0625 20.0625 L 21.34375 20.0625 L 21.34375 18.15625 L 21.96875 18.15625 L 21.96875 17.53125 L 20.0625 17.53125 L 20.0625 16.875 L 19.4375 16.875 z M 21.34375 20.0625 L 21.34375 20.6875 L 21.96875 20.6875 L 21.96875 20.0625 L 21.34375 20.0625 z M 21.34375 20.6875 L 20.6875 20.6875 L 20.6875 21.96875 L 21.96875 21.96875 L 21.96875 21.34375 L 21.34375 21.34375 L 21.34375 20.6875 z M 18.15625 16.25 L 17.53125 16.25 L 17.53125 16.875 L 18.15625 16.875 L 18.15625 16.25 z M 17.53125 16.875 L 16.875 16.875 L 16.875 17.53125 L 16.25 17.53125 L 16.25 18.15625 L 17.53125 18.15625 L 17.53125 16.875 z M 17.53125 20.0625 L 18.15625 20.0625 L 18.15625 19.4375 L 17.53125 19.4375 L 17.53125 20.0625 z M 18.15625 20.0625 L 18.15625 21.34375 L 18.78125 21.34375 L 18.78125 20.6875 L 19.4375 20.6875 L 19.4375 20.0625 L 18.15625 20.0625 z M 19.4375 20.6875 L 19.4375 21.34375 L 20.0625 21.34375 L 20.0625 20.6875 L 19.4375 20.6875 z M 19.4375 21.34375 L 18.78125 21.34375 L 18.78125 21.96875 L 19.4375 21.96875 L 19.4375 21.34375 z M 13.71875 16.875 L 13.71875 16.25 L 12.4375 16.25 L 12.4375 16.875 L 13.71875 16.875 z M 12.4375 16.25 L 12.4375 15.625 L 13.09375 15.625 L 13.09375 14.96875 L 12.4375 14.96875 L 12.4375 14.34375 L 14.34375 14.34375 L 14.34375 12.4375 L 13.71875 12.4375 L 13.71875 13.71875 L 11.1875 13.71875 L 11.1875 14.34375 L 11.8125 14.34375 L 11.8125 16.25 L 12.4375 16.25 z M 11.1875 14.34375 L 10.53125 14.34375 L 10.53125 14.96875 L 11.1875 14.96875 L 11.1875 14.34375 z M 10.53125 14.96875 L 9.90625 14.96875 L 9.90625 15.625 L 10.53125 15.625 L 10.53125 14.96875 z M 9.90625 15.625 L 8.625 15.625 L 8.625 16.875 L 9.90625 16.875 L 9.90625 15.625 z M 9.90625 14.96875 L 9.90625 14.34375 L 10.53125 14.34375 L 10.53125 13.71875 L 8.625 13.71875 L 8.625 14.34375 L 9.28125 14.34375 L 9.28125 14.96875 L 9.90625 14.96875 z "
+       id="path10" />
+    <path
+       style="fill:#000000;stroke:none"
+       d="m 13.71875,14.96875 0,1.28125 0.625,0 0,-1.28125 -0.625,0 z m 3.8125,0 0,0.65625 0.625,0 0,-0.65625 -0.625,0 z m -7,1.28125 0,0.625 0.65625,0 0,-0.625 -0.65625,0 z m -1.90625,1.28125 0,4.4375 4.46875,0 0,-4.4375 -4.46875,0 z m 0.65625,0.625 3.15625,0 0,3.1875 -3.15625,0 0,-3.1875 z"
+       id="path14"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;stroke:none"
+       d="m 9.9043479,18.791304 0,1.904348 1.9043481,0 0,-1.904348 -1.9043481,0 m 8.8869561,0 0,0.634783 0.634783,0 0,-0.634783 -0.634783,0 z"
+       id="path18" />
+  </g>
+</svg>

android/art/intro_3.svg

@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="550"
+   height="330"
+   id="svg3593"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="intro_3.svg">
+  <defs
+     id="defs3595">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect10505"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect10509"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect10513"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect10517"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect10527"
+       is_visible="true" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.8066667"
+     inkscape:cx="273.05915"
+     inkscape:cy="216.42064"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="719"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata3598">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-72.047244,-414.12837)">
+    <g
+       id="g3656"
+       transform="matrix(1.8527508,0,0,1.8527508,-534.03482,-567.62578)">
+      <g
+         inkscape:export-ydpi="166.74196"
+         inkscape:export-xdpi="166.74196"
+         inkscape:export-filename="/home/rlafuente/Projects/GPG/ilustras-site/weboftrust.png"
+         style="stroke:#5f8dd3;stroke-opacity:0.26600988"
+         id="g10533"
+         transform="translate(310.49464,529.52136)">
+        <path
+           style="fill:none;stroke:#5f8dd3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter"
+           d="m 53.577152,36.539389 c 3.446669,6.821656 9.246643,12.426248 16.182357,15.637227 6.935714,3.210979 14.961735,4.00731 22.393192,2.221824 7.907299,-1.899812 14.832479,-6.515235 21.932259,-10.481067 3.54988,-1.982916 7.19909,-3.826658 11.06232,-5.095157 3.86324,-1.268499 7.9621,-1.950918 12.01023,-1.568465 7.55605,0.713868 14.29924,5.037997 20.0543,9.986012 5.75505,4.948014 10.88297,10.652598 17.09252,15.016659 12.23228,8.596828 27.64271,11.323994 40.71864,18.573413 6.04873,3.353473 11.52302,7.634008 17.23318,11.53619 5.71015,3.902183 11.78069,7.481432 18.48492,9.180305 5.1565,1.30667 10.61142,1.45602 15.8165,0.35874 5.20509,-1.09728 10.15089,-3.446136 14.24242,-6.845596 4.09153,-3.39946 7.31575,-7.848629 9.2019,-12.822496 1.88615,-4.973867 2.42149,-10.462917 1.45781,-15.694384 -1.62813,-8.838564 -7.38236,-16.470616 -14.28877,-22.221494 -6.90641,-5.750877 -14.97858,-9.888348 -22.85805,-14.210969 -6.67516,-3.661949 -13.34554,-7.524675 -20.68086,-9.564462 -3.66766,-1.019893 -7.48659,-1.570017 -11.28788,-1.364723 -3.80128,0.205295 -7.58759,1.182729 -10.89298,3.071203 -4.13421,2.362008 -7.4027,6.094007 -9.57536,10.330791 -2.17267,4.236784 -3.28771,8.963787 -3.66217,13.710427 -0.74893,9.493278 1.38814,18.940272 2.93547,28.336495 1.54732,9.396223 2.47833,19.246711 -0.57059,28.268198 -1.52447,4.51075 -4.06131,8.72983 -7.62149,11.89147 -3.56017,3.16164 -8.17786,5.2126 -12.93779,5.33022 -4.16366,0.10288 -8.27321,-1.25405 -11.87295,-3.34893 -3.59974,-2.09488 -6.73235,-4.90518 -9.64832,-7.87903 -5.83193,-5.94769 -11.09784,-12.779115 -18.483,-16.632163 -4.39315,-2.292031 -9.39515,-3.403741 -14.34559,-3.188348 -4.95043,0.215392 -9.83697,1.757353 -14.01444,4.422291 -4.17747,2.664938 -7.63548,6.446226 -9.91745,10.84461 -2.281978,4.39838 -3.38224,9.40291 -3.155521,14.35284"
+           id="path10503"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#5f8dd3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter"
+           d="m 62.863858,97.260161 c 5.097542,1.2417 10.535263,1.054311 15.535232,-0.535361 4.99997,-1.589672 9.547503,-4.576956 12.992021,-8.534487 3.444517,-3.957531 5.775903,-8.873685 6.660624,-14.045147 C 98.936456,68.973704 98.371914,63.562122 96.438873,58.684612 93.295457,50.753045 86.579149,44.460097 78.70377,41.178446 70.828391,37.896796 61.897847,37.510872 53.577152,39.396837 45.07097,41.324844 37.068097,45.628355 31.011904,51.904889 c -6.056192,6.276533 -10.10073,14.535604 -11.009767,23.210049 -0.659048,6.28893 0.316775,12.723156 2.661565,18.595715 2.34479,5.872559 6.042984,11.181417 10.628449,15.535547 9.17093,8.70828 21.746528,13.41706 34.373791,14.1186 12.627264,0.70153 25.285435,-2.41925 36.744388,-7.77016 11.45896,-5.35091 21.79045,-12.87585 31.31845,-21.191927 17.74857,-15.491021 32.97169,-33.867347 51.88219,-47.916416 9.45525,-7.024534 19.85036,-12.939244 31.11597,-16.378996 11.26561,-3.439753 23.45429,-4.322673 34.87158,-1.425894 16.92854,4.295087 31.28951,16.988129 38.57555,32.860653 6.64539,14.476878 7.55739,31.493879 2.49737,46.59809 -5.06003,15.10422 -16.03914,28.1376 -30.06439,35.68966 -14.02525,7.55206 -30.94989,9.54377 -46.34516,5.45394 -15.39528,-4.08982 -29.10011,-14.21837 -37.5283,-27.73528"
+           id="path10507"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#5f8dd3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter"
+           d="m 210.7368,15.108529 c -9.52495,3.060099 -18.19707,8.730176 -24.82036,16.228234 -6.62329,7.498058 -11.1797,16.803687 -13.04083,26.633487 -3.11209,16.436863 1.4141,33.760561 10.32072,47.92134 8.90661,14.16078 21.56713,26.2605 36.11281,34.23029 13.44766,7.36817 29.50755,13.57769 44.641,11.10619 11.28635,-1.84322 21.62967,-9.64003 28.92782,-18.44436 9.26901,-11.18194 14.01979,-26.08798 16.20543,-40.446713 1.96182,-12.888262 2.02067,-26.992939 -3.08496,-38.988294 -3.92476,-9.220957 -10.69253,-18.662768 -19.95598,-22.486142 -10.45699,-4.315992 -23.22057,-1.704106 -33.87266,2.105018 -27.98558,10.007472 -49.35913,33.035776 -72.31941,52.153432 -11.48014,9.558828 -23.61256,18.515379 -37.12743,24.880379 -13.51486,6.36499 -28.55064,10.05696 -43.426629,8.68963 C 83.922493,117.27793 68.836585,110.10932 59.292048,97.974523 51.598811,88.193446 47.783569,75.44405 48.83938,63.044831 49.895191,50.645612 55.811132,38.72484 65.047363,30.385331 74.283594,22.045822 86.744566,17.373849 99.186856,17.585462 c 12.442294,0.211614 24.737184,5.304626 33.684484,13.953393"
+           id="path10511"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csssaaaaaaasssssssc" />
+        <path
+           style="fill:none;stroke:#5f8dd3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter"
+           d="m 172.87561,57.255888 c 8.01552,7.276306 13.79209,16.986143 16.36168,27.502338 2.56959,10.516195 1.92171,21.795824 -1.83508,31.948644 -3.75678,10.15282 -10.60712,19.13738 -19.40305,25.44807 -8.79593,6.31069 -19.50154,9.92173 -30.32279,10.22799 -10.82124,0.30626 -21.71395,-2.69351 -30.85273,-8.49661 -9.13877,-5.8031 -16.486304,-14.38584 -20.8113,-24.30993 C 81.687344,109.6523 80.402541,98.427374 82.373237,87.78268 84.343934,77.137987 89.562085,67.116978 97.153235,59.398974 108.15303,48.215368 123.29475,42.333858 137.87187,36.539389 c 28.70028,-11.408483 58.29155,-23.895549 89.1345,-22.291834 15.42148,0.801857 30.87843,5.329118 43.31677,14.480748 12.43835,9.151631 21.59546,23.178461 23.27965,38.528653 1.04157,9.493175 -0.76057,19.216885 -4.6936,27.919559 -3.93303,8.702675 -9.9518,16.396405 -17.13383,22.691145 -14.36406,12.58946 -32.98622,19.40885 -51.75186,22.96858 -18.05976,3.42583 -37.42238,3.91954 -54.12871,-3.7479 -8.35317,-3.83373 -15.85684,-9.70893 -21.03065,-17.30527 -5.17382,-7.59635 -7.91434,-16.95018 -6.99227,-26.094719 0.88562,-8.783118 5.05751,-17.008373 10.68216,-23.812107 5.62466,-6.803734 12.6598,-12.302867 19.94401,-17.289627 14.56842,-9.973521 30.87199,-18.599268 40.81003,-33.191916"
+           id="path10515"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cssssssssssssssssssssc" />
+        <path
+           style="fill:none;stroke:#5f8dd3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter"
+           d="m 216.95343,76.218535 c -0.63775,-10.663931 2.74188,-21.52057 9.31969,-29.938324 6.5778,-8.417754 16.29534,-14.321824 26.79712,-16.281092 10.12874,-1.889671 21.15578,0.01023 29.3712,6.228668 4.10771,3.10922 7.45652,7.247127 9.48852,11.981208 2.03199,4.734081 2.723,10.059732 1.80327,15.128719 -0.82355,4.538908 -2.9037,8.791225 -5.62962,12.512686 -2.72593,3.721461 -6.08741,6.938042 -9.64973,9.868873 -7.12465,5.861663 -15.13974,10.67971 -21.59516,17.271167 -6.10626,6.23494 -10.59583,13.82967 -15.41085,21.10816 -4.81503,7.27849 -10.1631,14.45867 -17.42261,19.30226 -4.70252,3.13755 -10.14495,5.20747 -15.77111,5.759 -5.62616,0.55153 -11.42693,-0.44266 -16.44787,-3.04036 -5.02094,-2.5977 -9.2248,-6.81889 -11.60028,-11.9487 -2.37548,-5.12981 -2.86461,-11.1488 -1.13733,-16.53159 1.51394,-4.71795 4.62952,-8.8005 8.31707,-12.11003 3.68756,-3.30954 7.94829,-5.909015 12.23973,-8.385821 4.29144,-2.476805 8.65526,-4.860296 12.64033,-7.804834 3.98507,-2.944537 7.61316,-6.500118 9.9915,-10.846904 2.4769,-4.526912 3.50341,-9.800373 3.11774,-14.94617 -0.38567,-5.145796 -2.15822,-10.155315 -4.91446,-14.517782 -5.51247,-8.724936 -14.77814,-14.642151 -24.66663,-17.596744 -9.88849,-2.954594 -20.40488,-3.170152 -30.69277,-2.350934 -10.28789,0.819217 -20.46984,2.645355 -30.73654,3.697344 -8.44667,0.865498 -17.15082,1.255551 -24.9183,4.685068 -3.88374,1.714758 -7.47926,4.203998 -10.114932,7.532218 -2.635675,3.328219 -4.260174,7.533457 -4.11436,11.7764 0.166509,4.845137 2.611199,9.412323 5.975762,12.902712 3.36456,3.490389 7.60074,6.014831 11.9365,8.183757 4.33577,2.168926 8.83001,4.028261 13.04511,6.423272 4.21509,2.395011 8.19738,5.386788 10.96844,9.364766 3.08088,4.422741 4.5049,9.937482 4.13305,15.314672 -0.37185,5.37719 -2.50704,10.5913 -5.87043,14.8032 -3.36338,4.2119 -7.92575,7.42411 -12.96108,9.34712 -5.03532,1.92302 -10.52909,2.57136 -15.895,2.06197 C 95.817577,134.1537 85.842178,128.53798 78.297211,120.83841 70.752243,113.13884 65.474495,103.46263 61.625888,93.392963 55.045111,76.174732 52.432838,57.453444 54.048935,39.091463"
+           id="path10525"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         inkscape:export-ydpi="166.74196"
+         inkscape:export-xdpi="166.74196"
+         inkscape:export-filename="/home/rlafuente/Projects/GPG/ilustras-site/weboftrust.png"
+         style="color:#000000;fill:#5f8dd3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76498926;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 528.73107,597.28713 9.13163,5.2711 0,10.54963 -7.93635,4.58066 0,18.03313 c 0,0.53513 -0.43001,0.96513 -0.96513,0.96513 l -0.46772,0 c -0.53513,0 -0.96513,-0.43 -0.96513,-0.96513 l 0,-0.48999 -0.69044,0 -3.50418,0 0,-1.04681 1.31408,0 c 0.13383,0 0.24499,-0.28144 0.24499,-0.40831 0,-0.12684 -0.11116,-0.4306 -0.24499,-0.4306 l -0.59393,0 0,-0.57907 c 0,0 0.24499,-0.10375 0.24499,-0.23758 l 0,-0.0668 c 0,-0.13382 -0.11116,-0.24498 -0.24499,-0.24498 l -0.72015,0 0,-0.7053 0.95029,0 c 0.13385,0 0.24501,-0.11115 0.24501,-0.24498 l 0,-0.77211 c 0,-0.13385 -0.11116,-0.24498 -0.24501,-0.24498 l -0.95029,0 0,-0.68301 3.50418,0 0.69044,0 0,-11.886 -7.92892,-4.57324 0,-10.54963 9.13162,-5.2711 z"
+         id="rect7319-3"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:export-ydpi="166.74196"
+         inkscape:export-xdpi="166.74196"
+         inkscape:export-filename="/home/rlafuente/Projects/GPG/ilustras-site/weboftrust.png"
+         inkscape:connector-curvature="0"
+         id="path10477"
+         d="m 448.27081,614.25901 9.13163,5.2711 0,10.54964 -7.93635,4.58064 0,18.03311 c 0,0.53513 -0.43001,0.96513 -0.96513,0.96513 l -0.46772,0 c -0.53513,0 -0.96513,-0.43 -0.96513,-0.96513 l 0,-0.48999 -0.69044,0 -3.50418,0 0,-1.04681 1.31408,0 c 0.13383,0 0.24499,-0.28144 0.24499,-0.40831 0,-0.12684 -0.11116,-0.4306 -0.24499,-0.4306 l -0.59393,0 0,-0.57907 c 0,0 0.24499,-0.10375 0.24499,-0.23758 l 0,-0.0668 c 0,-0.13382 -0.11116,-0.24498 -0.24499,-0.24498 l -0.72015,0 0,-0.7053 0.95029,0 c 0.13385,0 0.24501,-0.11115 0.24501,-0.24498 l 0,-0.77211 c 0,-0.13385 -0.11116,-0.24498 -0.24501,-0.24498 l -0.95029,0 0,-0.68301 3.50418,0 0.69044,0 0,-11.88598 -7.92892,-4.57322 0,-10.54964 9.13162,-5.2711 z"
+         style="color:#000000;fill:#5f8dd3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76498926;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:export-ydpi="166.74196"
+         inkscape:export-xdpi="166.74196"
+         inkscape:export-filename="/home/rlafuente/Projects/GPG/ilustras-site/weboftrust.png"
+         style="color:#000000;fill:#5f8dd3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76498926;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 484.18906,576.53886 9.13163,5.2711 0,10.54963 -7.93635,4.58066 0,18.03311 c 0,0.53513 -0.43001,0.96513 -0.96513,0.96513 l -0.46772,0 c -0.53513,0 -0.96513,-0.43 -0.96513,-0.96513 l 0,-0.48999 -0.69044,0 -3.50418,0 0,-1.04681 1.31408,0 c 0.13383,0 0.24499,-0.28144 0.24499,-0.40831 0,-0.12684 -0.11116,-0.4306 -0.24499,-0.4306 l -0.59393,0 0,-0.57907 c 0,0 0.24499,-0.10375 0.24499,-0.23758 l 0,-0.0668 c 0,-0.13382 -0.11116,-0.24498 -0.24499,-0.24498 l -0.72015,0 0,-0.7053 0.95029,0 c 0.13385,0 0.24501,-0.11115 0.24501,-0.24498 l 0,-0.77211 c 0,-0.13385 -0.11116,-0.24498 -0.24501,-0.24498 l -0.95029,0 0,-0.68301 3.50418,0 0.69044,0 0,-11.88598 -7.92892,-4.57324 0,-10.54963 9.13162,-5.2711 z"
+         id="path10479"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:export-ydpi="166.74196"
+         inkscape:export-xdpi="166.74196"
+         inkscape:export-filename="/home/rlafuente/Projects/GPG/ilustras-site/weboftrust.png"
+         inkscape:connector-curvature="0"
+         id="path10481"
+         d="m 444.47926,552.78386 9.13163,5.2711 0,10.54963 -7.93635,4.58066 0,18.03311 c 0,0.53513 -0.43001,0.96513 -0.96513,0.96513 l -0.46772,0 c -0.53513,0 -0.96513,-0.43 -0.96513,-0.96513 l 0,-0.48999 -0.69044,0 -3.50418,0 0,-1.04681 1.31408,0 c 0.13383,0 0.24499,-0.28144 0.24499,-0.40831 0,-0.12684 -0.11116,-0.4306 -0.24499,-0.4306 l -0.59393,0 0,-0.57907 c 0,0 0.24499,-0.10375 0.24499,-0.23758 l 0,-0.0668 c 0,-0.13382 -0.11116,-0.24498 -0.24499,-0.24498 l -0.72015,0 0,-0.7053 0.95029,0 c 0.13385,0 0.24501,-0.11115 0.24501,-0.24498 l 0,-0.77211 c 0,-0.13385 -0.11116,-0.24498 -0.24501,-0.24498 l -0.95029,0 0,-0.68301 3.50418,0 0.69044,0 0,-11.88598 -7.92892,-4.57324 0,-10.54963 9.13162,-5.2711 z"
+         style="color:#000000;fill:#5f8dd3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76498926;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:export-ydpi="166.74196"
+         inkscape:export-xdpi="166.74196"
+         inkscape:export-filename="/home/rlafuente/Projects/GPG/ilustras-site/weboftrust.png"
+         style="color:#000000;fill:#5f8dd3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76498926;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 408.06273,577.35447 9.13162,5.2711 0,10.54963 -7.93634,4.58066 0,18.03311 c 0,0.53513 -0.43001,0.96513 -0.96513,0.96513 l -0.46772,0 c -0.53513,0 -0.96513,-0.43 -0.96513,-0.96513 l 0,-0.48999 -0.69044,0 -3.50418,0 0,-1.04681 1.31408,0 c 0.13383,0 0.24499,-0.28144 0.24499,-0.40831 0,-0.12684 -0.11116,-0.4306 -0.24499,-0.4306 l -0.59393,0 0,-0.57907 c 0,0 0.24499,-0.10375 0.24499,-0.23758 l 0,-0.0668 c 0,-0.13382 -0.11116,-0.24498 -0.24499,-0.24498 l -0.72015,0 0,-0.7053 0.95029,0 c 0.13385,0 0.24501,-0.11115 0.24501,-0.24498 l 0,-0.77211 c 0,-0.13385 -0.11116,-0.24498 -0.24501,-0.24498 l -0.95029,0 0,-0.68301 3.50418,0 0.69044,0 0,-11.88598 -7.92892,-4.57324 0,-10.54963 9.13162,-5.2711 z"
+         id="path10483"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:export-ydpi="166.74196"
+         inkscape:export-xdpi="166.74196"
+         inkscape:export-filename="/home/rlafuente/Projects/GPG/ilustras-site/weboftrust.png"
+         inkscape:connector-curvature="0"
+         id="path10485"
+         d="m 409.49657,636.84092 9.13162,5.2711 0,10.54963 -7.93634,4.58066 0,18.03311 c 0,0.53513 -0.43001,0.96513 -0.96513,0.96513 l -0.46772,0 c -0.53513,0 -0.96513,-0.43 -0.96513,-0.96513 l 0,-0.48999 -0.69044,0 -3.50418,0 0,-1.04681 1.31408,0 c 0.13383,0 0.24499,-0.28144 0.24499,-0.40831 0,-0.12684 -0.11116,-0.4306 -0.24499,-0.4306 l -0.59393,0 0,-0.57907 c 0,0 0.24499,-0.10375 0.24499,-0.23758 l 0,-0.0668 c 0,-0.13382 -0.11116,-0.24498 -0.24499,-0.24498 l -0.72015,0 0,-0.7053 0.95029,0 c 0.13385,0 0.24501,-0.11115 0.24501,-0.24498 l 0,-0.77211 c 0,-0.13385 -0.11116,-0.24498 -0.24501,-0.24498 l -0.95029,0 0,-0.68301 3.50418,0 0.69044,0 0,-11.88598 -7.92892,-4.57324 0,-10.54963 9.13162,-5.2711 z"
+         style="color:#000000;fill:#5f8dd3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76498926;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:export-ydpi="166.74196"
+         inkscape:export-xdpi="166.74196"
+         inkscape:export-filename="/home/rlafuente/Projects/GPG/ilustras-site/weboftrust.png"
+         style="color:#000000;fill:#5f8dd3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76498926;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 373.31363,615.62797 9.13163,5.27111 0,10.54963 -7.93635,4.58066 0,18.03311 c 0,0.53513 -0.43001,0.96513 -0.96513,0.96513 l -0.46772,0 c -0.53513,0 -0.96513,-0.43 -0.96513,-0.96513 l 0,-0.48999 -0.69044,0 -3.50418,0 0,-1.04681 1.31408,0 c 0.13383,0 0.24499,-0.28144 0.24499,-0.40831 0,-0.12684 -0.11116,-0.4306 -0.24499,-0.4306 l -0.59393,0 0,-0.57907 c 0,0 0.24499,-0.10375 0.24499,-0.23758 l 0,-0.0668 c 0,-0.13382 -0.11116,-0.24498 -0.24499,-0.24498 l -0.72015,0 0,-0.7053 0.95029,0 c 0.13385,0 0.24501,-0.11115 0.24501,-0.24498 l 0,-0.77211 c 0,-0.13385 -0.11116,-0.24498 -0.24501,-0.24498 l -0.95029,0 0,-0.68301 3.50418,0 0.69044,0 0,-11.88598 -7.92892,-4.57324 0,-10.54963 9.13162,-5.27111 z"
+         id="path10487"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:export-ydpi="166.74196"
+         inkscape:export-xdpi="166.74196"
+         inkscape:export-filename="/home/rlafuente/Projects/GPG/ilustras-site/weboftrust.png"
+         inkscape:connector-curvature="0"
+         id="path10489"
+         d="m 364.72877,558.55827 9.13163,5.27111 0,10.54963 -7.93635,4.58066 0,18.03311 c 0,0.53513 -0.43001,0.96513 -0.96513,0.96513 l -0.46772,0 c -0.53513,0 -0.96513,-0.43 -0.96513,-0.96513 l 0,-0.48999 -0.69044,0 -3.50418,0 0,-1.04681 1.31408,0 c 0.13383,0 0.24499,-0.28144 0.24499,-0.40831 0,-0.12684 -0.11116,-0.4306 -0.24499,-0.4306 l -0.59393,0 0,-0.57907 c 0,0 0.24499,-0.10375 0.24499,-0.23758 l 0,-0.0668 c 0,-0.13382 -0.11116,-0.24498 -0.24499,-0.24498 l -0.72015,0 0,-0.7053 0.95029,0 c 0.13385,0 0.24501,-0.11115 0.24501,-0.24498 l 0,-0.77211 c 0,-0.13385 -0.11116,-0.24498 -0.24501,-0.24498 l -0.95029,0 0,-0.68301 3.50418,0 0.69044,0 0,-11.88598 -7.92892,-4.57324 0,-10.54963 9.13162,-5.27111 z"
+         style="color:#000000;fill:#5f8dd3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76498926;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:export-ydpi="166.74196"
+         inkscape:export-xdpi="166.74196"
+         inkscape:export-filename="/home/rlafuente/Projects/GPG/ilustras-site/weboftrust.png"
+         style="color:#000000;fill:#5f8dd3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76498926;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 519.15159,537.4864 9.13162,5.27111 0,10.54963 -7.93634,4.58066 0,18.03311 c 0,0.53513 -0.43001,0.96513 -0.96513,0.96513 l -0.46772,0 c -0.53513,0 -0.96513,-0.43 -0.96513,-0.96513 l 0,-0.48999 -0.69044,0 -3.50418,0 0,-1.04681 1.31408,0 c 0.13383,0 0.24499,-0.28144 0.24499,-0.40831 0,-0.12684 -0.11116,-0.4306 -0.24499,-0.4306 l -0.59393,0 0,-0.57907 c 0,0 0.24499,-0.10375 0.24499,-0.23758 l 0,-0.0668 c 0,-0.13382 -0.11116,-0.24498 -0.24499,-0.24498 l -0.72015,0 0,-0.7053 0.95029,0 c 0.13385,0 0.24501,-0.11115 0.24501,-0.24498 l 0,-0.77211 c 0,-0.13385 -0.11116,-0.24498 -0.24501,-0.24498 l -0.95029,0 0,-0.68301 3.50418,0 0.69044,0 0,-11.88598 -7.92892,-4.57324 0,-10.54963 9.13162,-5.27111 z"
+         id="path10491"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:export-ydpi="166.74196"
+         inkscape:export-xdpi="166.74196"
+         inkscape:export-filename="/home/rlafuente/Projects/GPG/ilustras-site/weboftrust.png"
+         inkscape:connector-curvature="0"
+         id="path10493"
+         d="m 490.91156,638.98513 9.13162,5.27111 0,10.54963 -7.93634,4.58066 0,18.03311 c 0,0.53513 -0.43001,0.96513 -0.96513,0.96513 l -0.46772,0 c -0.53513,0 -0.96513,-0.43 -0.96513,-0.96513 l 0,-0.48999 -0.69044,0 -3.50418,0 0,-1.04681 1.31408,0 c 0.13383,0 0.24499,-0.28144 0.24499,-0.40831 0,-0.12684 -0.11116,-0.4306 -0.24499,-0.4306 l -0.59393,0 0,-0.57907 c 0,0 0.24499,-0.10375 0.24499,-0.23758 l 0,-0.0668 c 0,-0.13382 -0.11116,-0.24498 -0.24499,-0.24498 l -0.72015,0 0,-0.7053 0.95029,0 c 0.13385,0 0.24501,-0.11115 0.24501,-0.24498 l 0,-0.77211 c 0,-0.13385 -0.11116,-0.24498 -0.24501,-0.24498 l -0.95029,0 0,-0.68301 3.50418,0 0.69044,0 0,-11.88598 -7.92892,-4.57324 0,-10.54963 9.13162,-5.27111 z"
+         style="color:#000000;fill:#5f8dd3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76498926;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:export-ydpi="166.74196"
+         inkscape:export-xdpi="166.74196"
+         inkscape:export-filename="/home/rlafuente/Projects/GPG/ilustras-site/weboftrust.png"
+         style="color:#000000;fill:#5f8dd3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76498926;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 532.20067,661.00753 9.13162,5.27111 0,10.54963 -7.93634,4.58066 0,18.03311 c 0,0.53513 -0.43001,0.96513 -0.96513,0.96513 l -0.46772,0 c -0.53513,0 -0.96513,-0.43 -0.96513,-0.96513 l 0,-0.48999 -0.69044,0 -3.50418,0 0,-1.04681 1.31408,0 c 0.13383,0 0.24499,-0.28144 0.24499,-0.40831 0,-0.12684 -0.11116,-0.4306 -0.24499,-0.4306 l -0.59393,0 0,-0.57907 c 0,0 0.24499,-0.10375 0.24499,-0.23758 l 0,-0.0668 c 0,-0.13382 -0.11116,-0.24498 -0.24499,-0.24498 l -0.72015,0 0,-0.7053 0.95029,0 c 0.13385,0 0.24501,-0.11115 0.24501,-0.24498 l 0,-0.77211 c 0,-0.13385 -0.11116,-0.24498 -0.24501,-0.24498 l -0.95029,0 0,-0.68301 3.50418,0 0.69044,0 0,-11.88598 -7.92892,-4.57324 0,-10.54963 9.13162,-5.27111 z"
+         id="path10495"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:export-ydpi="166.74196"
+         inkscape:export-xdpi="166.74196"
+         inkscape:export-filename="/home/rlafuente/Projects/GPG/ilustras-site/weboftrust.png"
+         inkscape:connector-curvature="0"
+         id="path10497"
+         d="m 567.87483,620.45653 9.13162,5.27111 0,10.54964 -7.93634,4.58066 0,18.0331 c 0,0.53513 -0.43001,0.96513 -0.96513,0.96513 l -0.46772,0 c -0.53513,0 -0.96513,-0.43 -0.96513,-0.96513 l 0,-0.48999 -0.69044,0 -3.50418,0 0,-1.04681 1.31408,0 c 0.13383,0 0.24499,-0.28144 0.24499,-0.40831 0,-0.12684 -0.11116,-0.4306 -0.24499,-0.4306 l -0.59393,0 0,-0.57907 c 0,0 0.24499,-0.10375 0.24499,-0.23757 l 0,-0.0668 c 0,-0.13382 -0.11116,-0.24498 -0.24499,-0.24498 l -0.72015,0 0,-0.7053 0.95029,0 c 0.13385,0 0.24501,-0.11115 0.24501,-0.24498 l 0,-0.77211 c 0,-0.13385 -0.11116,-0.24498 -0.24501,-0.24498 l -0.95029,0 0,-0.68301 3.50418,0 0.69044,0 0,-11.88598 -7.92892,-4.57324 0,-10.54964 9.13162,-5.27111 z"
+         style="color:#000000;fill:#5f8dd3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76498926;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:export-ydpi="166.74196"
+         inkscape:export-xdpi="166.74196"
+         inkscape:export-filename="/home/rlafuente/Projects/GPG/ilustras-site/weboftrust.png"
+         style="color:#000000;fill:#5f8dd3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76498926;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 563.92217,551.69123 9.13162,5.2711 0,10.54963 -7.93634,4.58066 0,18.03311 c 0,0.53513 -0.43001,0.96513 -0.96513,0.96513 l -0.46772,0 c -0.53513,0 -0.96513,-0.43 -0.96513,-0.96513 l 0,-0.48999 -0.69044,0 -3.50418,0 0,-1.04681 1.31408,0 c 0.13383,0 0.24499,-0.28144 0.24499,-0.40831 0,-0.12684 -0.11116,-0.4306 -0.24499,-0.4306 l -0.59393,0 0,-0.57907 c 0,0 0.24499,-0.10375 0.24499,-0.23758 l 0,-0.0668 c 0,-0.13382 -0.11116,-0.24498 -0.24499,-0.24498 l -0.72015,0 0,-0.7053 0.95029,0 c 0.13385,0 0.24501,-0.11115 0.24501,-0.24498 l 0,-0.77211 c 0,-0.13385 -0.11116,-0.24498 -0.24501,-0.24498 l -0.95029,0 0,-0.68301 3.50418,0 0.69044,0 0,-11.88598 -7.92892,-4.57324 0,-10.54963 9.13162,-5.2711 z"
+         id="path10499"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:export-ydpi="166.74196"
+         inkscape:export-xdpi="166.74196"
+         inkscape:export-filename="/home/rlafuente/Projects/GPG/ilustras-site/weboftrust.png"
+         style="color:#000000;fill:#5f8dd3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76498926;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 602.43919,583.17759 9.13162,5.27111 0,10.54963 -7.93634,4.58066 0,18.0331 c 0,0.53513 -0.43001,0.96513 -0.96513,0.96513 l -0.46772,0 c -0.53513,0 -0.96513,-0.43 -0.96513,-0.96513 l 0,-0.48999 -0.69044,0 -3.50418,0 0,-1.04681 1.31408,0 c 0.13383,0 0.24499,-0.28144 0.24499,-0.40831 0,-0.12684 -0.11116,-0.4306 -0.24499,-0.4306 l -0.59393,0 0,-0.57907 c 0,0 0.24499,-0.10375 0.24499,-0.23757 l 0,-0.0668 c 0,-0.13382 -0.11116,-0.24498 -0.24499,-0.24498 l -0.72015,0 0,-0.7053 0.95029,0 c 0.13385,0 0.24501,-0.11115 0.24501,-0.24498 l 0,-0.77211 c 0,-0.13385 -0.11116,-0.24498 -0.24501,-0.24498 l -0.95029,0 0,-0.68301 3.50418,0 0.69044,0 0,-11.88598 -7.92892,-4.57324 0,-10.54963 9.13162,-5.27111 z"
+         id="path10501"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

android/build.gradle

@@ -0,0 +1,139 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        versionCode 15
+        versionName '0.6.1'
+        minSdkVersion 14
+        targetSdkVersion 26
+        multiDexEnabled true
+
+        // For Espresso
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            applicationIdSuffix '.debug'
+            versionNameSuffix '-DEBUG'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+    lintOptions {
+        abortOnError false
+    }
+    packagingOptions {
+        exclude 'LICENSE.txt'
+    }
+    dexOptions {
+        javaMaxHeapSize '2g'
+        jumboMode = true
+    }
+}
+
+def supportVersion = '25.4.0'
+
+configurations.all {
+    resolutionStrategy {
+        force "com.android.support:design:$supportVersion"
+        force "com.android.support:support-annotations:$supportVersion"
+    }
+}
+
+dependencies {
+    // Local dependencies
+    implementation(project(':core')) {
+        // Replaced with Android-specific JavaMail
+        exclude group: 'com.sun.mail'
+        exclude group: 'com.sun.activation'
+        // BouncyCastle is replaced with SpongyCastle
+        exclude group: 'org.bouncycastle'
+    }
+    implementation project(':crypto')
+    implementation fileTree(dir: 'libs', include: '*.jar')
+
+    // Android Support Repository dependencies
+    //noinspection GradleCompatible
+    implementation 'com.android.support:multidex:1.0.3'
+    implementation "com.android.support:support-annotations:$supportVersion"
+    implementation "com.android.support:support-v4:$supportVersion"
+    implementation "com.android.support:appcompat-v7:$supportVersion"
+    implementation "com.android.support:preference-v7:$supportVersion"
+    implementation "com.android.support:preference-v14:$supportVersion"
+    implementation "com.android.support:recyclerview-v7:$supportVersion"
+
+    // Remote dependencies
+    implementation 'com.sun.mail:android-mail:1.6.3'
+    implementation 'com.sun.mail:android-activation:1.6.3'
+    implementation "net.i2p:router:$rootProject.i2pVersion"
+    implementation "net.i2p.android:client:$rootProject.i2pVersion@aar"
+    implementation 'net.i2p.android:helper:0.9.5@aar'
+    implementation 'net.i2p.android.ext:floatingactionbutton:1.10.1'
+    implementation 'com.madgag.spongycastle:core:1.58.0.0'
+    implementation 'com.madgag.spongycastle:prov:1.58.0.0'
+    implementation 'com.lambdaworks:scrypt:1.4.0'
+    implementation 'com.google.zxing:core:3.3.0'
+    implementation 'com.google.zxing:android-integration:3.3.0'
+    implementation 'com.androidplot:androidplot-core:1.5.6'
+    implementation 'com.inkapplications.viewpageindicator:library:2.4.4'
+    implementation 'com.pnikosis:materialish-progress:1.7'
+    implementation 'com.mikepenz:iconics-core:2.7.2@aar'
+    implementation 'com.mikepenz:google-material-typeface:2.2.0.3.original@aar'
+    implementation('com.mikepenz:materialdrawer:5.4.0@aar') {
+        transitive = true
+    }
+    implementation 'org.sufficientlysecure:html-textview:3.1'
+
+    // Testing-only dependencies
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
+}
+
+project.ext.i2pbase = '../i2p.i2p'
+def Properties props = new Properties()
+def propFile = new File(project(':android').projectDir, 'local.properties')
+
+if (propFile.canRead()) {
+    props.load(new FileInputStream(propFile))
+
+    if (props != null &&
+            props.containsKey('i2psrc')) {
+        i2pbase = props['i2psrc']
+    } else {
+        println 'local.properties found but some entries are missing'
+    }
+} else {
+    println 'local.properties not found'
+}
+
+task certificatesZip(type: Zip) {
+    archiveName = 'certificates_zip'
+    into('reseed') {
+        from files('' + i2pbase + '/installer/resources/certificates/reseed')
+    }
+    into('ssl') {
+        from files('' + i2pbase + '/installer/resources/certificates/ssl')
+    }
+}
+task copyI2PResources(type: Copy) {
+    // Force this to always run: Copy only detects source changes, not if missing in destination
+    outputs.upToDateWhen { false }
+    into 'src/main/res/raw'
+    from certificatesZip
+}
+task cleanI2PResources(type: Delete) {
+    delete file('src/main/res/raw/certificates_zip')
+}
+preBuild.dependsOn copyI2PResources
+clean.dependsOn cleanI2PResources
+
+apply from: "${project.rootDir}/gradle/signing.gradle"

android/proguard-rules.pro

@@ -0,0 +1,22 @@
+-dontobfuscate
+-dontoptimize
+-dontpreverify
+-dontshrink
+
+-dontwarn com.sun.mail.handlers.handler_base
+-dontwarn java.awt.**
+-dontwarn java.beans.Beans
+-dontwarn javax.naming.**
+-dontwarn javax.security.sasl.**
+-dontwarn javax.security.auth.callback.NameCallback
+
+-dontwarn android.test.**
+-dontwarn org.junit.**
+
+-dontwarn net.sf.ntru.**
+
+-keepclassmembers class i2p.bote.crypto.ECUtils {
+  public static java.security.spec.ECParameterSpec getParameters(java.lang.String);
+  public static byte[] encodePoint(java.security.spec.ECParameterSpec, java.security.spec.ECPoint, boolean);
+  public static java.security.spec.ECPoint decodePoint(java.security.spec.EllipticCurve, byte[]);
+}

android/src/androidTest/java/i2p/bote/android/EmailListActivityTest.java

@@ -0,0 +1,81 @@
+package i2p.bote.android;
+
+import android.support.test.espresso.NoMatchingViewException;
+import android.support.test.espresso.intent.rule.IntentsTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.v4.widget.DrawerLayout;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import i2p.bote.android.config.SettingsActivity;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.action.ViewActions.swipeDown;
+import static android.support.test.espresso.action.ViewActions.swipeRight;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.intent.Intents.intended;
+import static android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent;
+import static android.support.test.espresso.matcher.RootMatchers.withDecorView;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.not;
+
+@RunWith(AndroidJUnit4.class)
+public class EmailListActivityTest {
+
+    @Rule
+    public IntentsTestRule<EmailListActivity> mActivityRule = new IntentsTestRule<>(EmailListActivity.class);
+
+    @Before
+    public void closeIntro() {
+        try {
+            // Close intro on first open
+            onView(withId(R.id.skip_intro)).perform(click());
+            // Close nav drawer on first open
+            // FIXME: 6/20/15 doesn't work
+            onView(withClassName(equalTo(DrawerLayout.class.getName()))).perform(swipeRight());
+        } catch (NoMatchingViewException e) {
+        }
+    }
+
+    @Test
+    public void checkEmailFromActionMenuWhenNotConnected() {
+        openActionBarOverflowOrOptionsMenu(mActivityRule.getActivity());
+        onView(withText(R.string.check_email)).perform(click());
+        onView(withText(R.string.bote_needs_to_be_connected)).inRoot(withDecorView(not(mActivityRule.getActivity().getWindow().getDecorView()))) .check(matches(isDisplayed()));
+    }
+
+    @Test
+    public void checkEmailByPullWhenNotConnected() {
+        onView(withId(R.id.swipe_refresh)).perform(swipeDown());
+        onView(withText(R.string.bote_needs_to_be_connected)).inRoot(withDecorView(not(mActivityRule.getActivity().getWindow().getDecorView()))) .check(matches(isDisplayed()));
+    }
+
+    @Test
+    public void newEmail() {
+        onView(withId(R.id.promoted_action)).perform(click());
+        intended(hasComponent(NewEmailActivity.class.getName()));
+    }
+
+    @Test
+    public void openSettings() {
+        openActionBarOverflowOrOptionsMenu(mActivityRule.getActivity());
+        onView(withText(R.string.action_settings)).perform(click());
+        intended(hasComponent(SettingsActivity.class.getName()));
+    }
+
+    @Test
+    public void openHelp() {
+        openActionBarOverflowOrOptionsMenu(mActivityRule.getActivity());
+        onView(withText(R.string.help)).perform(click());
+        intended(hasComponent(HelpActivity.class.getName()));
+    }
+}

android/src/androidTest/java/i2p/bote/android/intro/IntroActivityTest.java

@@ -0,0 +1,35 @@
+package i2p.bote.android.intro;
+
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import i2p.bote.android.R;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.action.ViewActions.swipeLeft;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+
+@RunWith(AndroidJUnit4.class)
+public class IntroActivityTest {
+
+    @Rule
+    public ActivityTestRule<IntroActivity> mRule = new ActivityTestRule<>(IntroActivity.class);
+
+    @Test
+    public void enterSetup() {
+        onView(withId(R.id.pager)).perform(swipeLeft(), swipeLeft(), swipeLeft(), swipeLeft(), swipeLeft());
+        onView(withId(R.id.start_setup_wizard)).perform(click());
+        // TODO check result
+    }
+
+    @Test
+    public void closeIntro() {
+        onView(withId(R.id.skip_intro)).perform(click());
+        // TODO check result
+    }
+}

android/src/androidTest/java/i2p/bote/android/intro/SetupActivityTest.java

@@ -0,0 +1,84 @@
+package i2p.bote.android.intro;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.support.test.espresso.intent.rule.IntentsTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import i2p.bote.android.R;
+import i2p.bote.android.config.SetPasswordActivity;
+import i2p.bote.android.identities.EditIdentityActivity;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.intent.Intents.intended;
+import static android.support.test.espresso.intent.Intents.intending;
+import static android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+@RunWith(AndroidJUnit4.class)
+public class SetupActivityTest {
+
+    @Rule
+    public IntentsTestRule<SetupActivity> mRule = new IntentsTestRule<>(SetupActivity.class);
+
+    @Test
+    public void setPassword() {
+        // Check we are on "Set password" page
+        onView(withId(R.id.textView)).check(matches(withText(R.string.set_password)));
+
+        onView(withId(R.id.button_set_password)).perform(click());
+        intended(hasComponent(SetPasswordActivity.class.getName()));
+    }
+
+    @Test
+    public void nextPageAfterSetPassword() {
+        // Check we are on "Set password" page
+        onView(withId(R.id.textView)).check(matches(withText(R.string.set_password)));
+
+        intending(hasComponent(SetPasswordActivity.class.getName())).respondWith(new Instrumentation.ActivityResult(Activity.RESULT_OK, null));
+
+        onView(withId(R.id.button_set_password)).perform(click());
+        onView(withId(R.id.textView)).check(matches(withText(R.string.create_identity)));
+    }
+
+    @Test
+    public void createIdentity() {
+        onView(withId(R.id.textView)).check(matches(withText(R.string.set_password)));
+        onView(withId(R.id.button_skip)).perform(click());
+        onView(withId(R.id.textView)).check(matches(withText(R.string.create_identity)));
+
+        onView(withId(R.id.button_set_password)).perform(click());
+        intended(hasComponent(EditIdentityActivity.class.getName()));
+    }
+
+    @Test
+    public void nextPageAfterCreateIdentity() {
+        // Check we are on "Create identity" page
+        onView(withId(R.id.button_skip)).perform(click());
+        onView(withId(R.id.textView)).check(matches(withText(R.string.create_identity)));
+
+        intending(hasComponent(EditIdentityActivity.class.getName())).respondWith(new Instrumentation.ActivityResult(Activity.RESULT_OK, null));
+
+        onView(withId(R.id.button_set_password)).perform(click());
+        onView(withId(R.id.textView)).check(matches(withText(R.string.setup_finished)));
+    }
+
+    @Test
+    public void setupFinished() {
+        onView(withId(R.id.textView)).check(matches(withText(R.string.set_password)));
+        onView(withId(R.id.button_skip)).perform(click());
+        onView(withId(R.id.textView)).check(matches(withText(R.string.create_identity)));
+        onView(withId(R.id.button_skip)).perform(click());
+        onView(withId(R.id.textView)).check(matches(withText(R.string.setup_finished)));
+
+        onView(withId(R.id.button_finish)).perform(click());
+        // TODO check result
+    }
+}

android/src/androidTest/java/i2p/bote/android/provider/AttachmentProviderTests.java

@@ -0,0 +1,213 @@
+package i2p.bote.android.provider;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
+import android.provider.OpenableColumns;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.ProviderTestCase2;
+import android.test.suitebuilder.annotation.LargeTest;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.activation.DataHandler;
+import javax.activation.DataSource;
+import javax.mail.Part;
+import javax.mail.internet.MimeBodyPart;
+
+import i2p.bote.I2PBote;
+import i2p.bote.android.InitActivities;
+import i2p.bote.android.R;
+import i2p.bote.android.util.BoteHelper;
+import i2p.bote.android.util.ContentAttachment;
+import i2p.bote.email.Attachment;
+import i2p.bote.email.Email;
+import i2p.bote.folder.EmailFolder;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class AttachmentProviderTests extends ProviderTestCase2<AttachmentProvider> {
+    private static final String URI_PREFIX = "content://" + AttachmentProvider.AUTHORITY;
+    private static final String INVALID_URI = URI_PREFIX + "/invalid";
+    private static final String NO_MATCH_URI = URI_PREFIX + "/foo/bar/1/RAW";
+
+    public AttachmentProviderTests() {
+        super(AttachmentProvider.class, AttachmentProvider.AUTHORITY);
+        setContext(InstrumentationRegistry.getTargetContext());
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        testAndroidTestCaseSetupProperly();
+        new InitActivities(getMockContext().getDir("botetest", Context.MODE_PRIVATE).getAbsolutePath()).initialize();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void queryWithInvalidUriThrows() {
+        Uri invalidUri = Uri.parse(INVALID_URI);
+        getMockContentResolver().query(invalidUri, null, null, null, null);
+    }
+
+    @Test
+    public void getTypeWithInvalidUriReturnsNull() {
+        Uri invalidUri = Uri.parse(INVALID_URI);
+        String type = getMockContentResolver().getType(invalidUri);
+        assertThat("Type was not null", type, is(nullValue()));
+    }
+
+    @Test(expected = FileNotFoundException.class)
+    public void openFileWithInvalidUriThrows() throws FileNotFoundException {
+        Uri invalidUri = Uri.parse(INVALID_URI);
+        getMockContentResolver().openFileDescriptor(invalidUri, "r");
+    }
+
+    @Test
+    public void queryWithNoMatchReturnsNull() {
+        Uri noMatchUri = Uri.parse(NO_MATCH_URI);
+        Cursor c = getMockContentResolver().query(noMatchUri, null, null, null, null);
+        assertThat(c, is(nullValue()));
+    }
+
+    @Test
+    public void queryWithValidTextUri() throws Exception {
+        ContentAttachment attachment = createTextAttachment();
+        Uri uri = createEmailWithAttachment(attachment);
+
+        Cursor c = getMockContentResolver().query(uri, null, null, null, null);
+        assertThat(c.getCount(), is(1));
+        int nameIndex = c.getColumnIndex(OpenableColumns.DISPLAY_NAME);
+        int sizeIndex = c.getColumnIndex(OpenableColumns.SIZE);
+        c.moveToFirst();
+        assertThat(c.getString(nameIndex), is(equalTo(attachment.getFileName())));
+        assertThat(c.getLong(sizeIndex), is(equalTo(attachment.getSize())));
+    }
+
+    @Test
+    public void getTypeWithValidTextUri() throws Exception {
+        ContentAttachment attachment = createTextAttachment();
+        Uri uri = createEmailWithAttachment(attachment);
+        String type = getMockContentResolver().getType(uri);
+        assertThat("Type was not correct", type, is("text/plain"));
+    }
+
+    @Test
+    public void getTypeWithValidImageUri() throws Exception {
+        ContentAttachment attachment = createImageAttachment();
+        Uri uri = createEmailWithAttachment(attachment);
+        String type = getMockContentResolver().getType(uri);
+        assertThat("Type was not correct", type, is("image/png"));
+    }
+
+    @Test
+    public void openFileWithValidTextUri() throws Exception {
+        ContentAttachment attachment = createTextAttachment();
+        Uri uri = createEmailWithAttachment(attachment);
+        openFileWithValidUri(attachment, uri);
+    }
+
+    @Test
+    public void openFileWithValidImageUri() throws Exception {
+        ContentAttachment attachment = createImageAttachment();
+        Uri uri = createEmailWithAttachment(attachment);
+        openFileWithValidUri(attachment, uri);
+
+        assertThat("Image could not be decoded",
+                BitmapFactory.decodeStream(getMockContentResolver().openInputStream(uri)),
+                is(notNullValue()));
+    }
+
+    private void openFileWithValidUri(ContentAttachment attachment, Uri uri) throws Exception {
+        InputStream inProv = getMockContentResolver().openInputStream(uri);
+        InputStream inOrig = attachment.getDataHandler().getInputStream();
+        ByteArrayOutputStream outProv = new ByteArrayOutputStream();
+        ByteArrayOutputStream outOrig = new ByteArrayOutputStream();
+        BoteHelper.copyStream(inProv, outProv);
+        BoteHelper.copyStream(inOrig, outOrig);
+
+        assertThat("Provider content does not match original content",
+                outProv.toByteArray(), is(equalTo(outOrig.toByteArray())));
+    }
+
+    private ContentAttachment createTextAttachment() throws Exception {
+        return createAttachment("test.txt", "text/plain", "Test file content".getBytes());
+    }
+
+    private ContentAttachment createImageAttachment() throws Exception {
+        Bitmap bitmap = BitmapFactory.decodeResource(getContext().getResources(), R.drawable.intro_1);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
+        return createAttachment("intro_1.png", "image/png", out.toByteArray());
+    }
+
+    private ContentAttachment createAttachment(final String fileName, final String mimeType, final byte[] content) throws Exception {
+        Part part = new MimeBodyPart();
+        part.setDataHandler(new DataHandler(new DataSource() {
+            @Override
+            public InputStream getInputStream() throws IOException {
+                return new ByteArrayInputStream(content);
+            }
+
+            @Override
+            public OutputStream getOutputStream() throws IOException {
+                throw new IOException("Cannot write to attachments");
+            }
+
+            @Override
+            public String getContentType() {
+                return mimeType;
+            }
+
+            @Override
+            public String getName() {
+                return fileName;
+            }
+        }));
+        part.setFileName(fileName);
+        return new ContentAttachment(getMockContext(), part);
+    }
+
+    private Uri createEmailWithAttachment(Attachment attachment) throws Exception {
+        List<Attachment> attachments = new ArrayList<Attachment>();
+        attachments.add(attachment);
+        Email email = new Email(false);
+        email.setContent("", attachments);
+        I2PBote.getInstance().getInbox().add(email);
+        return AttachmentProvider.getUriForAttachment(
+                I2PBote.getInstance().getInbox().getName(),
+                email.getMessageID(),
+                1
+        );
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        super.tearDown();
+        EmailFolder inbox = I2PBote.getInstance().getInbox();
+        for (Email email : BoteHelper.getEmails(inbox, null, true)) {
+            inbox.delete(email.getMessageID());
+        }
+        System.setProperty("i2pbote.initialized", "false");
+    }
+}

android/src/debug/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">Bote DEBUG</string>
+</resources>

android/src/main/AndroidManifest.xml

@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    package="i2p.bote.android"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:sharedUserId="net.i2p">
+
+    <uses-sdk xmlns:tools="http://schemas.android.com/tools"
+        tools:overrideLibrary="android.support.v14.preference" />
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.NFC"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <application
+        android:name="android.support.multidex.MultiDexApplication"
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/Theme.Bote">
+        <service android:name=".service.BoteService"/>
+
+        <activity
+            android:name=".EmailListActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".intro.IntroActivity"
+            android:parentActivityName=".EmailListActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="i2p.bote.android.EmailListActivity"/>
+        </activity>
+        <activity
+            android:name=".intro.SetupActivity"
+            android:label="@string/title_activity_setup"
+            android:parentActivityName=".EmailListActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="i2p.bote.android.EmailListActivity"/>
+        </activity>
+        <activity
+            android:name=".ViewEmailActivity"
+            android:parentActivityName=".EmailListActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="i2p.bote.android.EmailListActivity"/>
+        </activity>
+        <activity
+            android:name=".NewEmailActivity"
+            android:label="@string/compose"
+            android:parentActivityName=".EmailListActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="i2p.bote.android.EmailListActivity"/>
+        </activity>
+        <activity
+            android:name=".addressbook.AddressBookActivity"
+            android:label="@string/address_book"
+            android:parentActivityName=".EmailListActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="i2p.bote.android.EmailListActivity"/>
+        </activity>
+        <activity
+            android:name=".addressbook.ViewContactActivity"
+            android:parentActivityName=".addressbook.AddressBookActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="i2p.bote.android.addressbook.AddressBookActivity"/>
+        </activity>
+        <activity
+            android:name=".addressbook.EditContactActivity"
+            android:label="@string/action_new_contact"
+            android:parentActivityName=".addressbook.ViewContactActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="i2p.bote.android.addressbook.ViewContactActivity"/>
+
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+
+                <data
+                    android:host="ext"
+                    android:pathPrefix="/i2p.bote:contact"
+                    android:scheme="vnd.android.nfc"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.nfc.action.TAG_DISCOVERED"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".addressbook.AddressBookShipActivity"
+            android:parentActivityName=".addressbook.AddressBookActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="i2p.bote.android.addressbook.AddressBookActivity"/>
+        </activity>
+        <activity
+            android:name=".NetworkInfoActivity"
+            android:label="@string/network_status"
+            android:parentActivityName=".EmailListActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="i2p.bote.android.EmailListActivity"/>
+        </activity>
+        <activity
+            android:name=".config.SettingsActivity"
+            android:label="@string/action_settings"
+            android:parentActivityName=".EmailListActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="i2p.bote.android.EmailListActivity"/>
+        </activity>
+        <activity
+            android:name=".config.SetPasswordActivity"
+            android:label="@string/pref_title_change_password"
+            android:parentActivityName=".config.SettingsActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="i2p.bote.android.config.SettingsActivity"/>
+        </activity>
+        <activity
+            android:name=".identities.IdentityListActivity"
+            android:label="@string/pref_title_identities"
+            android:parentActivityName=".config.SettingsActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="i2p.bote.android.config.SettingsActivity"/>
+        </activity>
+        <activity
+            android:name=".identities.ViewIdentityActivity"
+            android:parentActivityName=".identities.IdentityListActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="i2p.bote.android.identities.IdentityListActivity"/>
+        </activity>
+        <activity
+            android:name=".identities.EditIdentityActivity"
+            android:label="@string/title_new_identity"
+            android:parentActivityName=".identities.ViewIdentityActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".identities.ViewIdentityActivity"/>
+        </activity>
+        <activity
+            android:name=".identities.IdentityShipActivity"
+            android:parentActivityName=".identities.IdentityListActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="i2p.bote.android.identities.IdentityListActivity"/>
+        </activity>
+        <activity
+            android:name=".HelpActivity"
+            android:label="@string/help"
+            android:parentActivityName=".EmailListActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="i2p.bote.android.EmailListActivity"/>
+        </activity>
+
+        <provider
+            android:name=".provider.AttachmentProvider"
+            android:authorities="${applicationId}.attachmentprovider"
+            android:enabled="true"
+            android:exported="false"
+            android:grantUriPermissions="true">
+        </provider>
+    </application>
+
+</manifest>

android/src/main/java/i2p/bote/android/AndroidPeerStatsRenderer.java

@@ -0,0 +1,44 @@
+/**
+ * Copyright (C) 2017  str4d@mail.i2p
+ * <p>
+ * This file is part of I2P-Bote.
+ * I2P-Bote is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * I2P-Bote is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with I2P-Bote.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package i2p.bote.android;
+
+import i2p.bote.network.DhtPeerStats;
+import i2p.bote.network.DhtPeerStatsRenderer;
+
+/**
+ * Renders UI strings for DHT peer stats.
+ * @see DhtPeerStatsRenderer
+ */
+class AndroidPeerStatsRenderer implements DhtPeerStatsRenderer {
+
+    AndroidPeerStatsRenderer() {
+    }
+
+    @Override
+    public String translateHeading(DhtPeerStats.Columns column) {
+        // No-op, headings currently unused
+        return "";
+    }
+
+    @Override
+    public String translateContent(DhtPeerStats.Content content) {
+        // No-op, content currently unused
+        return "";
+    }
+}

android/src/main/java/i2p/bote/android/BoteActivityBase.java

@@ -0,0 +1,44 @@
+package i2p.bote.android;
+
+import android.annotation.SuppressLint;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
+import android.view.WindowManager;
+
+import i2p.bote.android.util.LocaleManager;
+
+@SuppressLint("Registered")
+public class BoteActivityBase extends AppCompatActivity {
+    private final LocaleManager localeManager = new LocaleManager();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        localeManager.onCreate(this);
+        super.onCreate(savedInstanceState);
+
+        // Initialize I2P settings
+        InitActivities init = new InitActivities(this);
+        init.initialize();
+
+        // Initialize screen security
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH &&
+                prefs.getBoolean("pref_screen_security", true))
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        else
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        localeManager.onResume(this);
+    }
+
+    public void notifyLocaleChanged() {
+        localeManager.onResume(this);
+    }
+}

android/src/main/java/i2p/bote/android/Constants.java

@@ -0,0 +1,16 @@
+package i2p.bote.android;
+
+public class Constants {
+    public static final String ANDROID_LOG_TAG = "I2P-Bote";
+
+    public static final String SHARED_PREFS = "i2p.bote";
+    public static final String PREF_SELECTED_IDENTITY = "selectedIdentity";
+
+    public static final String EMAILDEST_SCHEME = "bote";
+
+    public static final String NDEF_DOMAIN = "i2p.bote";
+    public static final String NDEF_TYPE_CONTACT = "contact";
+    public static final String NDEF_TYPE_CONTACT_DESTINATION = "contactDestination";
+    public static final String NDEF_LEGACY_TYPE_CONTACT = NDEF_DOMAIN + ":" + NDEF_TYPE_CONTACT;
+    public static final String NDEF_LEGACY_TYPE_CONTACT_DESTINATION = NDEF_DOMAIN + ":" + NDEF_TYPE_CONTACT_DESTINATION;
+}

android/src/main/java/i2p/bote/android/EmailListActivity.java

@@ -0,0 +1,734 @@
+package i2p.bote.android;
+
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningServiceInfo;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.LoaderManager;
+import android.support.v4.content.Loader;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.Toolbar;
+import android.util.DisplayMetrics;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+
+import com.mikepenz.google_material_typeface_library.GoogleMaterial;
+import com.mikepenz.iconics.IconicsDrawable;
+import com.mikepenz.iconics.typeface.IIcon;
+import com.mikepenz.materialdrawer.AccountHeader;
+import com.mikepenz.materialdrawer.AccountHeaderBuilder;
+import com.mikepenz.materialdrawer.Drawer;
+import com.mikepenz.materialdrawer.DrawerBuilder;
+import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
+import com.mikepenz.materialdrawer.model.ProfileDrawerItem;
+import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
+import com.mikepenz.materialdrawer.model.interfaces.IProfile;
+
+import net.i2p.android.ui.I2PAndroidHelper;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.mail.MessagingException;
+
+import i2p.bote.I2PBote;
+import i2p.bote.android.addressbook.AddressBookActivity;
+import i2p.bote.android.config.SettingsActivity;
+import i2p.bote.android.intro.IntroActivity;
+import i2p.bote.android.intro.SetupActivity;
+import i2p.bote.android.service.BoteService;
+import i2p.bote.android.service.Init;
+import i2p.bote.android.service.Init.RouterChoice;
+import i2p.bote.android.util.BetterAsyncTaskLoader;
+import i2p.bote.android.util.BoteHelper;
+import i2p.bote.android.util.MoveToDialogFragment;
+import i2p.bote.email.EmailIdentity;
+import i2p.bote.email.IdentitiesListener;
+import i2p.bote.fileencryption.PasswordCacheListener;
+import i2p.bote.fileencryption.PasswordException;
+import i2p.bote.folder.EmailFolder;
+import i2p.bote.folder.FolderListener;
+import i2p.bote.network.NetworkStatusListener;
+
+public class EmailListActivity extends BoteActivityBase implements
+        EmailListFragment.OnEmailSelectedListener,
+        MoveToDialogFragment.MoveToDialogListener,
+        PasswordCacheListener,
+        NetworkStatusListener {
+    private I2PAndroidHelper mHelper;
+    private RouterChoice mRouterChoice;
+
+    private SharedPreferences mSharedPrefs;
+
+    /**
+     * Navigation drawer variables
+     */
+    private AccountHeader mAccountHeader;
+    private Drawer mDrawer;
+    private long mSelected;
+
+    private static final String PREF_FIRST_START = "firstStart";
+
+    private static final int SHOW_INTRODUCTION = 1;
+    private static final int RUN_SETUP = 2;
+
+    private static final int ID_ADDRESS_BOOK = 1;
+    private static final int ID_NET_STATUS = 2;
+    private static final int ID_ALL_MAIL = 3;
+    private static final int ID_LOCKED = 4;
+
+    private static final int LOADER_IDENTITIES = 0;
+    private static final int LOADER_DRAWER_FOLDERS = 1;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
+        // Initialize variables
+        mHelper = new I2PAndroidHelper(this);
+        mSharedPrefs = getSharedPreferences(Constants.SHARED_PREFS, 0);
+
+        mAccountHeader = new AccountHeaderBuilder()
+                .withActivity(this)
+                .withHeaderBackground(R.drawable.drawer_header_background)
+                .withSelectionListEnabledForSingleProfile(false)
+                .addProfiles(getLockedProfile())
+                .withOnAccountHeaderListener(new AccountHeader.OnAccountHeaderListener() {
+                    @Override
+                    public boolean onProfileChanged(View view, IProfile profile, boolean currentProfile) {
+                        if (profile.getIdentifier() == ID_LOCKED)
+                            findViewById(R.id.action_log_in).performClick();
+                        else if (!currentProfile)
+                            identitySelected(profile);
+                        return false;
+                    }
+                })
+                .withSavedInstance(savedInstanceState)
+                .build();
+
+        IDrawerItem addressBook = new PrimaryDrawerItem()
+                .withIdentifier(ID_ADDRESS_BOOK)
+                .withName(R.string.address_book)
+                .withIcon(new IconicsDrawable(this, GoogleMaterial.Icon.gmd_contacts).colorRes(R.color.md_grey_600).sizeDp(24))
+                .withIconTintingEnabled(true)
+                .withSelectedIconColorRes(R.color.primary);
+        IDrawerItem networkStatus = getNetStatusItem(
+                R.string.network_status, GoogleMaterial.Icon.gmd_cloud_off, R.color.md_grey_600, 0);
+
+        // Set the drawer width per Material design spec
+        // http://www.google.com/design/spec/layout/structure.html#structure-side-nav-1
+        // Mobile: side nav width = min(screen width - app bar height, 320dp)
+        // Desktop: side nav width = min(screen width - app bar height, 400dp)
+        int maxWidth = getResources().getDimensionPixelSize(R.dimen.nav_max_width);
+        DisplayMetrics dm = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(dm);
+        int drawerWidth = Math.min(dm.widthPixels - toolbar.getLayoutParams().height, maxWidth);
+
+        mDrawer = new DrawerBuilder()
+                .withActivity(this)
+                .withToolbar(toolbar)
+                .withDrawerWidthPx(drawerWidth)
+                .withShowDrawerOnFirstLaunch(true)
+                .withAccountHeader(mAccountHeader)
+                .addStickyDrawerItems(addressBook, networkStatus)
+                .withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() {
+                    @Override
+                    public boolean onItemClick(View view, int i, IDrawerItem iDrawerItem) {
+                        long id = iDrawerItem.getIdentifier();
+                        if (id == ID_ADDRESS_BOOK) {
+                            mDrawer.setSelection(mSelected, false);
+                            mDrawer.closeDrawer();
+                            Intent ai = new Intent(EmailListActivity.this, AddressBookActivity.class);
+                            startActivity(ai);
+                            return true;
+                        } else if (id == ID_NET_STATUS) {
+                            mDrawer.setSelection(mSelected, false);
+                            netStatusSelected();
+                            return true;
+                        } else {
+                            drawerFolderSelected((EmailFolder) iDrawerItem.getTag(), mSelected == i);
+                            mSelected = mDrawer.getCurrentSelection();
+                            return false;
+                        }
+                    }
+                })
+                .withSavedInstance(savedInstanceState)
+                .build();
+
+        mSelected = mDrawer.getCurrentSelection();
+
+        // Enable ActionBar app icon to behave as action to toggle nav drawer
+        //noinspection ConstantConditions
+        getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+        mDrawer.getActionBarDrawerToggle().setDrawerIndicatorEnabled(true);
+
+        if (savedInstanceState == null) {
+            EmailListFragment f = EmailListFragment.newInstance("inbox");
+            getSupportFragmentManager().beginTransaction()
+                    .add(R.id.list_fragment, f).commit();
+        }
+
+        // If first start, go to introduction and setup wizard
+        if (mSharedPrefs.getBoolean(PREF_FIRST_START, true)) {
+            mSharedPrefs.edit().putBoolean(PREF_FIRST_START, false).apply();
+            Intent i = new Intent(EmailListActivity.this, IntroActivity.class);
+            startActivityForResult(i, SHOW_INTRODUCTION);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        mAccountHeader.saveInstanceState(outState);
+        mDrawer.saveInstanceState(outState);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu
+        getMenuInflater().inflate(R.menu.main, menu);
+        if (isBoteServiceRunning())
+            menu.findItem(R.id.action_start_bote).setVisible(false);
+        else
+            menu.findItem(R.id.action_stop_bote).setVisible(false);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        if (prefs.getBoolean("i2pbote.router.auto", true) ||
+                prefs.getString("i2pbote.router.use", "internal").equals("android")) {
+            // Try to bind to I2P Android
+            mHelper.bind();
+        }
+
+        I2PBote.getInstance().addPasswordCacheListener(this);
+        I2PBote.getInstance().addNetworkStatusListener(this);
+        // Fetch current network status
+        networkStatusChanged();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (I2PBote.getInstance().isPasswordRequired()) {
+            // Ensure any existing data is destroyed.
+            getSupportLoaderManager().destroyLoader(LOADER_IDENTITIES);
+        } else {
+            // Password is cached, or not set.
+            getSupportLoaderManager().initLoader(LOADER_IDENTITIES, null, new IdentityLoaderCallbacks());
+        }
+
+        getSupportLoaderManager().initLoader(LOADER_DRAWER_FOLDERS, null, new DrawerFolderLoaderCallbacks());
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        mHelper.unbind();
+
+        I2PBote.getInstance().removePasswordCacheListener(this);
+        I2PBote.getInstance().removeNetworkStatusListener(this);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_start_bote:
+                // Init from settings
+                Init init = new Init(this);
+                mRouterChoice = init.initialize(mHelper);
+
+                if (mRouterChoice == RouterChoice.ANDROID) {
+                    if (!mHelper.isI2PAndroidInstalled()) {
+                        // I2P Android not installed
+                        mHelper.promptToInstall(this);
+                    } else if (!mHelper.isI2PAndroidRunning()) {
+                        // Ask user to start I2P Android
+                        mHelper.requestI2PAndroidStart(this);
+                    } else
+                        startBote();
+                } else
+                    startBote();
+                return true;
+
+            case R.id.action_stop_bote:
+                Intent stop = new Intent(this, BoteService.class);
+                stopService(stop);
+                supportInvalidateOptionsMenu();
+                return true;
+
+            case R.id.action_settings:
+                Intent si = new Intent(this, SettingsActivity.class);
+                startActivity(si);
+                return true;
+
+            case R.id.action_help:
+                Intent hi = new Intent(this, HelpActivity.class);
+                startActivity(hi);
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == SHOW_INTRODUCTION) {
+            if (resultCode == RESULT_OK) {
+                Intent i = new Intent(EmailListActivity.this, SetupActivity.class);
+                startActivityForResult(i, RUN_SETUP);
+            }
+        } else if (requestCode == RUN_SETUP) {
+            if (resultCode == RESULT_OK) {
+                // TODO implement a UI tutorial?
+            }
+        } else if (requestCode == I2PAndroidHelper.REQUEST_START_I2P) {
+            if (resultCode == RESULT_OK) {
+                startBote();
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    @Override
+    public void setTitle(CharSequence title) {
+        getSupportActionBar().setTitle(title);
+    }
+
+
+    //
+    // Helpers
+    //
+
+    private IProfile getLockedProfile() {
+        return new ProfileDrawerItem()
+                .withIdentifier(ID_LOCKED)
+                .withEmail(getString(R.string.touch_lock_to_log_in))
+                .withIcon(new IconicsDrawable(this, GoogleMaterial.Icon.gmd_lock).color(Color.WHITE).sizeRes(com.mikepenz.materialdrawer.R.dimen.material_drawer_account_header_selected));
+    }
+
+    private IDrawerItem getNetStatusItem(int nameRes, IIcon icon, int iconColorRes, int padding) {
+        return new PrimaryDrawerItem()
+                .withIdentifier(ID_NET_STATUS)
+                .withName(nameRes)
+                .withIcon(new IconicsDrawable(this, icon).colorRes(iconColorRes).sizeDp(24).paddingDp(padding))
+                .withIconTintingEnabled(true)
+                .withSelectedIconColorRes(R.color.primary);
+    }
+
+    private void identitySelected(IProfile profile) {
+        EmailIdentity identity = (EmailIdentity) ((ProfileDrawerItem) profile).getTag();
+        mSharedPrefs.edit()
+                .putString(Constants.PREF_SELECTED_IDENTITY,
+                        identity == null ? null : identity.getKey())
+                .apply();
+        // Trigger the drawer folder loader to update the drawer badges
+        getSupportLoaderManager().restartLoader(LOADER_DRAWER_FOLDERS, null, new DrawerFolderLoaderCallbacks());
+        EmailListFragment f = (EmailListFragment) getSupportFragmentManager()
+                .findFragmentById(R.id.list_fragment);
+        f.onIdentitySelected();
+    }
+
+    private void drawerFolderSelected(EmailFolder folder, boolean alreadySelected) {
+        if (!alreadySelected) {
+            // Create the new fragment
+            EmailListFragment f = EmailListFragment.newInstance(folder.getName());
+
+            // Insert the fragment
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.list_fragment, f).commit();
+        }
+        // Close the drawer
+        mDrawer.closeDrawer();
+    }
+
+    private void netStatusSelected() {
+        int boteNotStartedMessage = R.string.network_info_unavailable;
+        switch (I2PBote.getInstance().getNetworkStatus()) {
+            case DELAY:
+                boteNotStartedMessage = R.string.network_info_unavailable_delay;
+            case NOT_STARTED:
+                DialogFragment df = NetStatusDialogFragment.newInstance(boteNotStartedMessage);
+                df.show(getSupportFragmentManager(), "noinfo");
+                break;
+            default:
+                mDrawer.closeDrawer();
+                Intent nii = new Intent(EmailListActivity.this, NetworkInfoActivity.class);
+                startActivity(nii);
+        }
+    }
+
+    private boolean isBoteServiceRunning() {
+        ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+        for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+            if (BoteService.class.getName().equals(service.service.getClassName()))
+                return true;
+        }
+        return false;
+    }
+
+    private void startBote() {
+        Intent start = new Intent(this, BoteService.class);
+        start.putExtra(BoteService.ROUTER_CHOICE, mRouterChoice);
+        startService(start);
+        supportInvalidateOptionsMenu();
+    }
+
+    public static class NetStatusDialogFragment extends DialogFragment {
+        public static DialogFragment newInstance(int message) {
+            DialogFragment f = new NetStatusDialogFragment();
+            Bundle args = new Bundle();
+            args.putInt("message", message);
+            f.setArguments(args);
+            return f;
+        }
+
+        @Override
+        @NonNull
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            int message = getArguments().getInt("message");
+            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+            builder.setMessage(message)
+                    .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            dialog.dismiss();
+                        }
+                    });
+            return builder.create();
+        }
+    }
+
+
+    //
+    // Loaders
+    //
+
+    private class IdentityLoaderCallbacks implements LoaderManager.LoaderCallbacks<ArrayList<IProfile>> {
+        @Override
+        public Loader<ArrayList<IProfile>> onCreateLoader(int id, Bundle args) {
+            return new DrawerIdentityLoader(EmailListActivity.this);
+        }
+
+        @Override
+        public void onLoadFinished(Loader<ArrayList<IProfile>> loader, ArrayList<IProfile> data) {
+            mAccountHeader.setProfiles(data);
+            String selectedIdentity = mSharedPrefs.getString(Constants.PREF_SELECTED_IDENTITY, null);
+            for (IProfile profile : data) {
+                EmailIdentity identity = (EmailIdentity) ((ProfileDrawerItem) profile).getTag();
+                if ((identity == null && selectedIdentity == null) ||
+                        (identity != null && identity.getKey().equals(selectedIdentity))) {
+                    mAccountHeader.setActiveProfile(profile, true);
+                    break;
+                }
+            }
+        }
+
+        @Override
+        public void onLoaderReset(Loader<ArrayList<IProfile>> loader) {
+            mAccountHeader.clear();
+            mAccountHeader.addProfiles(getLockedProfile());
+        }
+    }
+
+    private static class DrawerIdentityLoader extends BetterAsyncTaskLoader<ArrayList<IProfile>> implements IdentitiesListener {
+        private int identiconSize;
+
+        public DrawerIdentityLoader(Context context) {
+            super(context);
+            // Must be a multiple of nine
+            identiconSize = context.getResources().getDimensionPixelSize(R.dimen.identicon);
+        }
+
+        @Override
+        public ArrayList<IProfile> loadInBackground() {
+            ArrayList<IProfile> profiles = new ArrayList<>();
+            try {
+                // Fetch the identities first, so we trigger any exceptions
+                Collection<EmailIdentity> identities = I2PBote.getInstance().getIdentities().getAll();
+                profiles.add(new ProfileDrawerItem()
+                        .withIdentifier(ID_ALL_MAIL)
+                        .withTag(null)
+                        .withEmail(getContext().getString(R.string.all_mail))
+                        .withIcon(getContext().getResources().getDrawable(R.drawable.ic_contact_picture))
+                );
+                for (EmailIdentity identity : identities) {
+                    profiles.add(getIdentityDrawerItem(identity));
+                }
+            } catch (PasswordException e) {
+                // TODO handle, but should not get here
+                e.printStackTrace();
+            } catch (GeneralSecurityException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            return profiles;
+        }
+
+        private IProfile getIdentityDrawerItem(EmailIdentity identity) {
+            return new ProfileDrawerItem()
+                    .withIdentifier(identity.hashCode())
+                    .withTag(identity)
+                    .withName(identity.getDescription())
+                    .withEmail(identity.getPublicName() + " <" + identity.getKey().substring(0, 4) + ">")
+                    .withIcon(BoteHelper.getIdentityPicture(identity, identiconSize, identiconSize));
+        }
+
+        @Override
+        protected void onStartMonitoring() {
+            I2PBote.getInstance().getIdentities().addIdentitiesListener(this);
+        }
+
+        @Override
+        protected void onStopMonitoring() {
+            I2PBote.getInstance().getIdentities().removeIdentitiesListener(this);
+        }
+
+        @Override
+        protected void releaseResources(ArrayList<IProfile> data) {
+        }
+
+        // IdentitiesListener
+
+        @Override
+        public void identityAdded(String s) {
+            onContentChanged();
+        }
+
+        @Override
+        public void identityUpdated(String s) {
+            onContentChanged();
+        }
+
+        @Override
+        public void identityRemoved(String s) {
+            onContentChanged();
+        }
+    }
+
+    private class DrawerFolderLoaderCallbacks implements LoaderManager.LoaderCallbacks<ArrayList<IDrawerItem>> {
+        @Override
+        public Loader<ArrayList<IDrawerItem>> onCreateLoader(int id, Bundle args) {
+            return new DrawerFolderLoader(EmailListActivity.this, I2PBote.getInstance().getEmailFolders());
+        }
+
+        @Override
+        public void onLoadFinished(Loader<ArrayList<IDrawerItem>> loader, ArrayList<IDrawerItem> data) {
+            if (mDrawer.getDrawerItems() == null || mDrawer.getDrawerItems().size() == 0)
+                mDrawer.setItems(data);
+            else {
+                // Assumes that no folders have been added or removed
+                // TODO change this if necessary when user folders are implemented
+                for (IDrawerItem item : data) {
+                    mDrawer.updateItem(item);
+                }
+            }
+        }
+
+        @Override
+        public void onLoaderReset(Loader<ArrayList<IDrawerItem>> loader) {
+            mDrawer.removeAllItems();
+        }
+    }
+
+    private static class DrawerFolderLoader extends BetterAsyncTaskLoader<ArrayList<IDrawerItem>> implements FolderListener {
+        private List<EmailFolder> mFolders;
+
+        public DrawerFolderLoader(Context context, List<EmailFolder> folders) {
+            super(context);
+            mFolders = folders;
+        }
+
+        @Override
+        public ArrayList<IDrawerItem> loadInBackground() {
+            ArrayList<IDrawerItem> drawerItems = new ArrayList<>();
+
+            for (EmailFolder folder : mFolders) {
+                drawerItems.add(getFolderDrawerItem(folder));
+            }
+
+            return drawerItems;
+        }
+
+        private IDrawerItem getFolderDrawerItem(EmailFolder folder) {
+            PrimaryDrawerItem item = new PrimaryDrawerItem()
+                    .withIdentifier(folder.hashCode())
+                    .withTag(folder)
+                    .withIconTintingEnabled(true)
+                    .withSelectedIconColorRes(R.color.primary)
+                    .withIcon(BoteHelper.getFolderIcon(getContext(), folder))
+                    .withName(BoteHelper.getFolderDisplayName(getContext(), folder));
+
+            try {
+                int numNew = BoteHelper.getNumNewEmails(getContext(), folder);
+                if (numNew > 0)
+                    item.withBadge("" + numNew);
+            } catch (PasswordException e) {
+                // Password fetching is handled in EmailListFragment
+            } catch (MessagingException | GeneralSecurityException | IOException e) {
+                e.printStackTrace();
+            }
+
+            return item;
+        }
+
+        @Override
+        protected void onStartMonitoring() {
+            if (mFolders != null) {
+                for (EmailFolder folder : mFolders) {
+                    folder.addFolderListener(this);
+                }
+            }
+        }
+
+        @Override
+        protected void onStopMonitoring() {
+            if (mFolders != null) {
+                for (EmailFolder folder : mFolders) {
+                    folder.removeFolderListener(this);
+                }
+            }
+        }
+
+        @Override
+        protected void releaseResources(ArrayList<IDrawerItem> data) {
+        }
+
+        // FolderListener
+
+        @Override
+        public void elementAdded(String s) {
+            onContentChanged();
+        }
+
+        @Override
+        public void elementUpdated() {
+            onContentChanged();
+        }
+
+        @Override
+        public void elementRemoved(String s) {
+            onContentChanged();
+        }
+    }
+
+
+    //
+    // Interfaces
+    //
+
+    // FolderFragment.OnEmailSelectedListener
+
+    @Override
+    public void onEmailSelected(String folderName, String messageId) {
+        // In single-pane mode, simply start the detail activity
+        // for the selected message ID.
+        Intent detailIntent = new Intent(this, ViewEmailActivity.class);
+        detailIntent.putExtra(ViewEmailActivity.FOLDER_NAME, folderName);
+        detailIntent.putExtra(ViewEmailActivity.MESSAGE_ID, messageId);
+        startActivity(detailIntent);
+    }
+
+    // MoveToDialogFragment.MoveToDialogListener
+
+    @Override
+    public void onFolderSelected(EmailFolder newFolder) {
+        EmailListFragment f = (EmailListFragment) getSupportFragmentManager().findFragmentById(R.id.list_fragment);
+        f.onFolderSelected(newFolder);
+    }
+
+    // PasswordCacheListener
+
+    @Override
+    public void passwordProvided() {
+        // Password is cached, or not set.
+        getSupportLoaderManager().restartLoader(LOADER_IDENTITIES, null, new IdentityLoaderCallbacks());
+        // Trigger the drawer folder loader to show the drawer badges
+        getSupportLoaderManager().restartLoader(LOADER_DRAWER_FOLDERS, null, new DrawerFolderLoaderCallbacks());
+    }
+
+    @Override
+    public void passwordCleared() {
+        // Ensure any existing data is destroyed.
+        getSupportLoaderManager().destroyLoader(LOADER_IDENTITIES);
+        // Trigger the drawer folder loader to hide the drawer badges
+        getSupportLoaderManager().restartLoader(LOADER_DRAWER_FOLDERS, null, new DrawerFolderLoaderCallbacks());
+        // Hide account selection list
+        if (mAccountHeader.isSelectionListShown())
+            mAccountHeader.toggleSelectionList(this);
+    }
+
+    // NetworkStatusListener
+
+    @Override
+    public void networkStatusChanged() {
+        // Update network status
+        final int statusText;
+        final IIcon statusIcon;
+        final int colorRes;
+        final int padding;
+        switch (I2PBote.getInstance().getNetworkStatus()) {
+            case DELAY:
+                statusText = R.string.connect_delay;
+                statusIcon = GoogleMaterial.Icon.gmd_av_timer;
+                colorRes = R.color.md_grey_600;
+                padding = 3;
+                break;
+            case CONNECTING:
+                statusText = R.string.connecting;
+                statusIcon = GoogleMaterial.Icon.gmd_cloud_queue;
+                colorRes = R.color.md_grey_600;
+                padding = 0;
+                break;
+            case CONNECTED:
+                statusText = R.string.connected;
+                statusIcon = GoogleMaterial.Icon.gmd_cloud_done;
+                colorRes = R.color.md_grey_600;
+                padding = 0;
+                break;
+            case ERROR:
+                statusText = R.string.error;
+                statusIcon = GoogleMaterial.Icon.gmd_error;
+                colorRes = R.color.red;
+                padding = 2;
+                break;
+            case NOT_STARTED:
+            default:
+                statusText = R.string.not_started;
+                statusIcon = GoogleMaterial.Icon.gmd_cloud_off;
+                colorRes = R.color.md_grey_600;
+                padding = 0;
+        }
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mDrawer.updateStickyFooterItem(getNetStatusItem(statusText, statusIcon, colorRes, padding));
+            }
+        });
+    }
+}

android/src/main/java/i2p/bote/android/EmailListAdapter.java

@@ -0,0 +1,319 @@
+package i2p.bote.android;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Typeface;
+import android.os.Build;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import javax.mail.Part;
+
+import i2p.bote.android.util.BoteHelper;
+import i2p.bote.android.util.MultiSelectionUtil;
+import i2p.bote.email.Email;
+
+public class EmailListAdapter extends MultiSelectionUtil.SelectableAdapter<RecyclerView.ViewHolder> {
+    private static final DateFormat DATE_BEFORE_THIS_YEAR = DateFormat.getDateInstance(DateFormat.MEDIUM);
+    private static final DateFormat DATE_THIS_YEAR = new SimpleDateFormat(
+            ((SimpleDateFormat) SimpleDateFormat.getDateInstance(DateFormat.MEDIUM))
+                    .toPattern().replaceAll(",?\\W?[Yy]+\\W?", "")
+    );
+    private static final DateFormat DATE_TODAY = DateFormat.getTimeInstance();
+
+    private Calendar BOUNDARY_DAY;
+    private Calendar BOUNDARY_YEAR;
+
+    private Context mCtx;
+    private String mFolderName;
+    private EmailListFragment.OnEmailSelectedListener mListener;
+    private boolean mIsOutbox;
+    private List<Email> mEmails;
+    private int mIncompleteEmails;
+
+    public static class SimpleViewHolder extends RecyclerView.ViewHolder {
+        public SimpleViewHolder(View itemView) {
+            super(itemView);
+        }
+    }
+
+    public static class EmailViewHolder extends RecyclerView.ViewHolder {
+        public ImageView picture;
+        //public ImageView emailSelected;
+        public TextView subject;
+        public TextView address;
+        public TextView content;
+        public TextView sent;
+        public ImageView emailAttachment;
+        public TextView emailStatus;
+        public ImageView emailDelivered;
+
+        public EmailViewHolder(View itemView) {
+            super(itemView);
+
+            picture = (ImageView) itemView.findViewById(R.id.contact_picture);
+            //emailSelected = view.findViewById(R.id.email_selected);
+            subject = (TextView) itemView.findViewById(R.id.email_subject);
+            address = (TextView) itemView.findViewById(R.id.email_address);
+            content = (TextView) itemView.findViewById(R.id.email_content);
+            sent = (TextView) itemView.findViewById(R.id.email_sent);
+            emailAttachment = (ImageView) itemView.findViewById(R.id.email_attachment);
+            emailStatus = (TextView) itemView.findViewById(R.id.email_status);
+            emailDelivered = (ImageView) itemView.findViewById(R.id.email_delivered);
+        }
+    }
+
+    public EmailListAdapter(Context context, String folderName,
+                            EmailListFragment.OnEmailSelectedListener listener) {
+        super();
+        mCtx = context;
+        mFolderName = folderName;
+        mListener = listener;
+        mIsOutbox = BoteHelper.isOutbox(folderName);
+        mIncompleteEmails = 0;
+        setHasStableIds(true);
+
+        setDateBoundaries();
+    }
+
+    /**
+     * Set up the boundaries for date display formats.
+     * <p/>
+     * TODO: call this method at midnight to refresh the UI
+     */
+    public void setDateBoundaries() {
+        BOUNDARY_DAY = Calendar.getInstance();
+        BOUNDARY_DAY.set(Calendar.HOUR, 0);
+        BOUNDARY_DAY.set(Calendar.MINUTE, 0);
+        BOUNDARY_DAY.set(Calendar.SECOND, 0);
+
+        BOUNDARY_YEAR = Calendar.getInstance();
+        BOUNDARY_YEAR.set(Calendar.MONTH, Calendar.JANUARY);
+        BOUNDARY_YEAR.set(Calendar.DAY_OF_MONTH, 1);
+        BOUNDARY_YEAR.set(Calendar.HOUR, 0);
+        BOUNDARY_YEAR.set(Calendar.MINUTE, 0);
+        BOUNDARY_YEAR.set(Calendar.SECOND, 0);
+
+        if (mEmails != null)
+            notifyDataSetChanged();
+    }
+
+    public void setEmails(List<Email> emails) {
+        mEmails = emails;
+        notifyDataSetChanged();
+    }
+
+    public Email getEmail(int position) {
+        if (mIncompleteEmails > 0)
+            position--;
+
+        if (position < 0)
+            return null;
+
+        return mEmails.get(position);
+    }
+
+    public void setIncompleteEmails(int incompleteEmails) {
+        if (incompleteEmails > 0) {
+            if (mIncompleteEmails == 0) {
+                mIncompleteEmails = incompleteEmails;
+                notifyItemInserted(0);
+            } else {
+                mIncompleteEmails = incompleteEmails;
+                notifyItemChanged(0);
+            }
+        } else if (mIncompleteEmails > 0) {
+            mIncompleteEmails = 0;
+            notifyItemRemoved(0);
+        }
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (mEmails == null || mEmails.isEmpty())
+            return R.layout.listitem_empty;
+
+        if (mIncompleteEmails > 0)
+            position--;
+
+        return position < 0 ? R.layout.listitem_incomplete : R.layout.listitem_email;
+    }
+
+    // Create new views (invoked by the layout manager)
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext())
+                .inflate(viewType, parent, false);
+        switch (viewType) {
+            case R.layout.listitem_email:
+                return new EmailViewHolder(v);
+            default:
+                return new SimpleViewHolder(v);
+        }
+    }
+
+    // Replace the contents of a view (invoked by the layout manager)
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        switch (holder.getItemViewType()) {
+            case R.layout.listitem_empty:
+                ((TextView) holder.itemView).setText(
+                        mCtx.getResources().getString(R.string.folder_empty));
+                break;
+
+            case R.layout.listitem_incomplete:
+                ((TextView) holder.itemView).setText(
+                        mCtx.getResources().getQuantityString(R.plurals.incomplete_emails,
+                                mIncompleteEmails, mIncompleteEmails));
+                break;
+
+            case R.layout.listitem_email:
+                final EmailViewHolder evh = (EmailViewHolder) holder;
+                final Email email = getEmail(position);
+
+                evh.picture.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        selectEmail(evh.getAdapterPosition(), evh.getItemId(), true);
+                    }
+                });
+                evh.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        selectEmail(evh.getAdapterPosition(), evh.getItemId(), false);
+                    }
+                });
+                evh.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+                    @Override
+                    public boolean onLongClick(View view) {
+                        selectEmail(evh.getAdapterPosition(), evh.getItemId(), true);
+                        return true;
+                    }
+                });
+
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB)
+                    evh.itemView.setSelected(isSelected(position));
+                else
+                    evh.itemView.setActivated(isSelected(position));
+                // TODO fix
+                //holder.emailSelected.setVisibility(isSelected(position) ? View.VISIBLE : View.GONE);
+
+                try {
+                    boolean isSentEmail = BoteHelper.isSentEmail(email);
+                    String otherAddress;
+                    if (isSentEmail)
+                        otherAddress = email.getOneRecipient();
+                    else
+                        otherAddress = email.getOneFromAddress();
+
+                    Bitmap pic = BoteHelper.getPictureForAddress(otherAddress);
+                    if (pic != null)
+                        evh.picture.setImageBitmap(pic);
+                    else if (isSentEmail || !email.isAnonymous()) {
+                        ViewGroup.LayoutParams lp = evh.picture.getLayoutParams();
+                        evh.picture.setImageBitmap(BoteHelper.getIdenticonForAddress(otherAddress, lp.width, lp.height));
+                    } else
+                        evh.picture.setImageDrawable(
+                                mCtx.getResources().getDrawable(R.drawable.ic_contact_picture));
+
+                    evh.subject.setText(email.getSubject());
+                    evh.address.setText(BoteHelper.getNameAndShortDestination(otherAddress));
+
+                    Date date = email.getSentDate();
+                    if (date == null)
+                        date = email.getReceivedDate();
+                    if (date != null) {
+                        DateFormat df;
+                        if (date.before(BOUNDARY_DAY.getTime())) {
+                            if (date.before(BOUNDARY_YEAR.getTime())) // Sent before this year
+                                df = DATE_BEFORE_THIS_YEAR;
+                            else // Sent this year before today
+                                df = DATE_THIS_YEAR;
+                        } else // Sent today
+                            df = DATE_TODAY;
+                        evh.sent.setText(df.format(date));
+                        evh.sent.setVisibility(View.VISIBLE);
+                    } else
+                        evh.sent.setVisibility(View.GONE);
+
+                    evh.emailAttachment.setVisibility(View.GONE);
+                    for (Part part : email.getParts()) {
+                        if (Part.ATTACHMENT.equalsIgnoreCase(part.getDisposition())) {
+                            evh.emailAttachment.setVisibility(View.VISIBLE);
+                            break;
+                        }
+                    }
+
+                    evh.subject.setTypeface(email.isUnread() ? Typeface.DEFAULT_BOLD : Typeface.DEFAULT);
+                    evh.address.setTypeface(email.isUnread() ? Typeface.DEFAULT_BOLD : Typeface.DEFAULT);
+                    if (email.isAnonymous() && !isSentEmail) {
+                        if (email.isUnread())
+                            evh.address.setTypeface(Typeface.DEFAULT, Typeface.BOLD_ITALIC);
+                        else
+                            evh.address.setTypeface(Typeface.DEFAULT, Typeface.ITALIC);
+                    }
+
+                    // Set email sending status if this is the outbox,
+                    // or set email delivery status if we sent it.
+                    if (mIsOutbox) {
+                        evh.emailStatus.setText(BoteHelper.getEmailStatusText(
+                                mCtx, email, false));
+                        evh.emailStatus.setVisibility(View.VISIBLE);
+                    } else if (isSentEmail) {
+                        if (email.isDelivered()) {
+                            evh.emailStatus.setVisibility(View.GONE);
+                        } else {
+                            evh.emailStatus.setText(email.getDeliveryPercentage() + "%");
+                            evh.emailStatus.setVisibility(View.VISIBLE);
+                        }
+                    }
+                    evh.emailDelivered.setVisibility(
+                            !mIsOutbox && isSentEmail && email.isDelivered() ?
+                                    View.VISIBLE : View.GONE);
+                } catch (Exception e) {
+                    evh.subject.setText("ERROR: " + e.getMessage());
+                }
+                evh.content.setText(email.getText());
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    private void selectEmail(int position, long id, boolean selectorOnly) {
+        if (selectorOnly || getSelector().inActionMode()) {
+            getSelector().selectItem(position, id);
+        } else {
+            final Email email = getEmail(position);
+            mListener.onEmailSelected(mFolderName, email.getMessageID());
+        }
+    }
+
+    // Return the size of the dataset (invoked by the layout manager)
+    @Override
+    public int getItemCount() {
+        if (mEmails == null || mEmails.isEmpty())
+            return 1;
+
+        return mIncompleteEmails > 0 ? mEmails.size() + 1 : mEmails.size();
+    }
+
+    public long getItemId(int position) {
+        if (mEmails == null || mEmails.isEmpty())
+            return 0;
+
+        Email email = getEmail(position);
+        return email == null ? 1 : email.getMessageID().hashCode();
+    }
+}

android/src/main/java/i2p/bote/android/EmailListFragment.java

@@ -0,0 +1,577 @@
+package i2p.bote.android;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.LoaderManager;
+import android.support.v4.content.Loader;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.view.ActionMode;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.Toast;
+
+import com.mikepenz.google_material_typeface_library.GoogleMaterial;
+import com.pnikosis.materialishprogress.ProgressWheel;
+
+import net.i2p.I2PAppContext;
+import net.i2p.util.Log;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.mail.Address;
+import javax.mail.Flags.Flag;
+import javax.mail.MessagingException;
+
+import i2p.bote.I2PBote;
+import i2p.bote.android.util.AuthenticatedFragment;
+import i2p.bote.android.util.BetterAsyncTaskLoader;
+import i2p.bote.android.util.BoteHelper;
+import i2p.bote.android.util.MoveToDialogFragment;
+import i2p.bote.android.util.MultiSelectionUtil;
+import i2p.bote.android.widget.DividerItemDecoration;
+import i2p.bote.android.widget.LoadingRecyclerView;
+import i2p.bote.android.widget.MultiSwipeRefreshLayout;
+import i2p.bote.email.Email;
+import i2p.bote.fileencryption.PasswordException;
+import i2p.bote.folder.EmailFolder;
+import i2p.bote.folder.FolderListener;
+
+public class EmailListFragment extends AuthenticatedFragment implements
+        LoaderManager.LoaderCallbacks<List<Email>>,
+        MoveToDialogFragment.MoveToDialogListener,
+        SwipeRefreshLayout.OnRefreshListener {
+    public static final String FOLDER_NAME = "folder_name";
+
+    private static final int EMAIL_LIST_LOADER = 1;
+
+    OnEmailSelectedListener mCallback;
+
+    private MultiSwipeRefreshLayout mSwipeRefreshLayout;
+    private AsyncTask<Void, Void, Void> mCheckingTask;
+
+    private LoadingRecyclerView mEmailsList;
+    private EmailListAdapter mAdapter;
+    private EmailFolder mFolder;
+
+    private ImageButton mNewEmail;
+    private MenuItem mCheckEmail;
+
+    // The Controller which provides CHOICE_MODE_MULTIPLE_MODAL-like functionality
+    private MultiSelectionUtil.Controller mMultiSelectController;
+    private ModalChoiceListener mModalChoiceListener;
+
+    public static EmailListFragment newInstance(String folderName) {
+        EmailListFragment f = new EmailListFragment();
+        Bundle args = new Bundle();
+        args.putString(FOLDER_NAME, folderName);
+        f.setArguments(args);
+        return f;
+    }
+
+    // Container Activity must implement this interface
+    public interface OnEmailSelectedListener {
+        public void onEmailSelected(String folderName, String messageId);
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+
+        // This makes sure that the container activity has implemented
+        // the callback interface. If not, it throws an exception
+        try {
+            mCallback = (OnEmailSelectedListener) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity.toString()
+                    + " must implement OnEmailSelectedListener");
+        }
+    }
+
+    @Override
+    public View onCreateAuthenticatedView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        String folderName = getArguments().getString(FOLDER_NAME);
+        mFolder = BoteHelper.getMailFolder(folderName);
+        boolean isInbox = BoteHelper.isInbox(mFolder);
+
+        View v = inflater.inflate(
+                isInbox ? R.layout.fragment_list_emails_with_refresh : R.layout.fragment_list_emails,
+                container, false);
+
+        mEmailsList = (LoadingRecyclerView) v.findViewById(R.id.emails_list);
+        View empty = v.findViewById(R.id.empty);
+        ProgressWheel loading = (ProgressWheel) v.findViewById(R.id.loading);
+        mEmailsList.setLoadingView(empty, loading);
+
+        mNewEmail = (ImageButton) v.findViewById(R.id.promoted_action);
+        mNewEmail.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startNewEmail();
+            }
+        });
+
+        if (isInbox) {
+            mSwipeRefreshLayout = (MultiSwipeRefreshLayout) v;
+
+            // Set up the MultiSwipeRefreshLayout
+            mSwipeRefreshLayout.setColorSchemeResources(
+                    R.color.primary, R.color.accent, R.color.primary, R.color.accent);
+            mSwipeRefreshLayout.setSwipeableChildren(R.id.emails_list);
+            mSwipeRefreshLayout.setOnRefreshListener(this);
+        }
+
+        return v;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        mEmailsList.setHasFixedSize(true);
+        mEmailsList.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
+
+        // Use a linear layout manager
+        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity());
+        mEmailsList.setLayoutManager(mLayoutManager);
+
+        // Set the adapter for the list view
+        mAdapter = new EmailListAdapter(getActivity(), mFolder.getName(), mCallback);
+        mEmailsList.setAdapter(mAdapter);
+
+        // Attach a MultiSelectionUtil.Controller to the ListView, giving it an instance of
+        // ModalChoiceListener (see below)
+        mModalChoiceListener = new ModalChoiceListener();
+        mMultiSelectController = MultiSelectionUtil
+                .attachMultiSelectionController(mEmailsList, (AppCompatActivity) getActivity(),
+                        mModalChoiceListener);
+
+        // Allow the Controller to restore itself
+        mMultiSelectController.restoreInstanceState(savedInstanceState);
+
+        if (mFolder == null) {
+            mFolder = I2PBote.getInstance().getInbox();
+            Toast.makeText(getActivity(), R.string.folder_does_not_exist, Toast.LENGTH_SHORT).show();
+        }
+
+        getActivity().setTitle(
+                BoteHelper.getFolderDisplayName(getActivity(), mFolder));
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        if (mSwipeRefreshLayout != null) {
+            boolean isChecking = I2PBote.getInstance().isCheckingForMail();
+            mSwipeRefreshLayout.setRefreshing(isChecking);
+            if (isChecking)
+                onRefresh();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+
+        if (mCheckingTask != null) {
+            mCheckingTask.cancel(true);
+            mCheckingTask = null;
+            mSwipeRefreshLayout.setRefreshing(false);
+        }
+    }
+
+    /**
+     * Start loading the list of emails from this folder.
+     * Only called when we have a password cached, or no
+     * password is required.
+     */
+    protected void onInitializeFragment() {
+        if (mFolder == null)
+            return;
+
+        if (BoteHelper.isInbox(mFolder)) {
+            mAdapter.setIncompleteEmails(I2PBote.getInstance().getNumIncompleteEmails());
+        }
+
+        getLoaderManager().initLoader(EMAIL_LIST_LOADER, null, this);
+    }
+
+    protected void onDestroyFragment() {
+        mAdapter.setIncompleteEmails(0);
+
+        getLoaderManager().destroyLoader(EMAIL_LIST_LOADER);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        // Allow the Controller to save it's instance state so that any checked items are
+        // stored
+        if (mMultiSelectController != null)
+            mMultiSelectController.saveInstanceState(outState);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.email_list, menu);
+        mCheckEmail = menu.findItem(R.id.action_check_email);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        boolean passwordRequired = I2PBote.getInstance().isPasswordRequired();
+        mNewEmail.setVisibility(passwordRequired ? View.GONE : View.VISIBLE);
+        mCheckEmail.setVisible(mSwipeRefreshLayout != null && !passwordRequired);
+        if (mSwipeRefreshLayout != null) {
+            mSwipeRefreshLayout.setEnabled(!passwordRequired);
+            if (mSwipeRefreshLayout.isRefreshing()) {
+                mCheckEmail.setTitle(R.string.checking_email);
+                mCheckEmail.setEnabled(false);
+            } else {
+                mCheckEmail.setTitle(R.string.check_email);
+                mCheckEmail.setEnabled(true);
+            }
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_check_email:
+                if (!mSwipeRefreshLayout.isRefreshing()) {
+                    mSwipeRefreshLayout.setRefreshing(true);
+                    onRefresh();
+                    getActivity().supportInvalidateOptionsMenu();
+                }
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private void startNewEmail() {
+        Intent nei = new Intent(getActivity(), NewEmailActivity.class);
+        startActivity(nei);
+    }
+
+    private class ModalChoiceListener implements MultiSelectionUtil.MultiChoiceModeListener {
+        private boolean areUnread;
+
+        @Override
+        public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) {
+            int numChecked = mAdapter.getSelectedItemCount();
+
+            mode.setTitle(getResources().getString(R.string.items_selected, numChecked));
+
+            if (checked && numChecked == 1) { // This is the first checked item
+                Email email = mAdapter.getEmail(position);
+                areUnread = email.isUnread();
+                mode.invalidate();
+            }
+        }
+
+        @Override
+        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+            // Respond to clicks on the actions in the CAB
+            switch (item.getItemId()) {
+                case R.id.action_delete:
+                    List<Integer> toDelete = mAdapter.getSelectedItems();
+                    if (toDelete.size() == 0)
+                        return false;
+
+                    for (int i = (toDelete.size() - 1); i >= 0; i--) {
+                        Email email = mAdapter.getEmail(toDelete.get(i));
+                        BoteHelper.revokeAttachmentUriPermissions(
+                                getActivity(),
+                                mFolder.getName(),
+                                email);
+                        // The Loader will update mAdapter
+                        I2PBote.getInstance().deleteEmail(mFolder, email.getMessageID());
+                    }
+                    mode.finish();
+                    return true;
+
+                case R.id.action_mark_read:
+                case R.id.action_mark_unread:
+                    List<Integer> selected = mAdapter.getSelectedItems();
+                    for (int i = (selected.size() - 1); i >= 0; i--) {
+                        Email email = mAdapter.getEmail(selected.get(i));
+                        try {
+                            // The Loader will update mAdapter
+                            mFolder.setNew(email, !areUnread);
+                        } catch (PasswordException e) {
+                            // TODO Auto-generated catch block
+                            e.printStackTrace();
+                        } catch (GeneralSecurityException e) {
+                            // TODO Auto-generated catch block
+                            e.printStackTrace();
+                        }
+                    }
+                    areUnread = !areUnread;
+                    mode.invalidate();
+                    return true;
+
+                case R.id.action_move_to:
+                    DialogFragment f = MoveToDialogFragment.newInstance(mFolder);
+                    f.show(getFragmentManager(), "moveTo");
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+
+        @Override
+        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+            // Inflate the menu for the CAB
+            MenuInflater inflater = mode.getMenuInflater();
+            inflater.inflate(R.menu.email_list_context, menu);
+            MenuItem markRead = menu.findItem(R.id.action_mark_read);
+            MenuItem markUnread = menu.findItem(R.id.action_mark_unread);
+            MenuItem moveTo = menu.findItem(R.id.action_move_to);
+
+            menu.findItem(R.id.action_delete).setIcon(BoteHelper.getMenuIcon(getActivity(), GoogleMaterial.Icon.gmd_delete));
+            markRead.setIcon(BoteHelper.getMenuIcon(getActivity(), GoogleMaterial.Icon.gmd_drafts));
+            markUnread.setIcon(BoteHelper.getMenuIcon(getActivity(), GoogleMaterial.Icon.gmd_markunread));
+            moveTo.setIcon(BoteHelper.getMenuIcon(getActivity(), GoogleMaterial.Icon.gmd_folder));
+
+            if (BoteHelper.isOutbox(mFolder)) {
+                markRead.setVisible(false);
+                markUnread.setVisible(false);
+            }
+            // Only allow moving from the trash
+            // TODO change this when user folders are implemented
+            if (!BoteHelper.isTrash(mFolder))
+                moveTo.setVisible(false);
+            return true;
+        }
+
+        @Override
+        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+            // Here you can perform updates to the CAB due to
+            // an invalidate() request
+            if (!BoteHelper.isOutbox(mFolder)) {
+                menu.findItem(R.id.action_mark_read).setVisible(areUnread);
+                menu.findItem(R.id.action_mark_unread).setVisible(!areUnread);
+            }
+            return true;
+        }
+
+        @Override
+        public void onDestroyActionMode(ActionMode mode) {
+        }
+    }
+
+    // Called by EmailListActivity.onIdentitySelected()
+
+    public void onIdentitySelected() {
+        getLoaderManager().restartLoader(EMAIL_LIST_LOADER, null, this);
+    }
+
+    // Called by EmailListActivity.onFolderSelected()
+
+    public void onFolderSelected(EmailFolder newFolder) {
+        List<Integer> toMove = mAdapter.getSelectedItems();
+        for (int i = (toMove.size() - 1); i >= 0; i--) {
+            Email email = mAdapter.getEmail(toMove.get(i));
+            mFolder.move(email, newFolder);
+        }
+        mMultiSelectController.finish();
+    }
+
+    // LoaderManager.LoaderCallbacks<List<Email>>
+
+    public Loader<List<Email>> onCreateLoader(int id, Bundle args) {
+        return new EmailListLoader(getActivity(), mFolder,
+                getActivity().getSharedPreferences(Constants.SHARED_PREFS, 0)
+                        .getString(Constants.PREF_SELECTED_IDENTITY, null));
+    }
+
+    private static class EmailListLoader extends BetterAsyncTaskLoader<List<Email>> implements
+            FolderListener {
+        private EmailFolder mFolder;
+        private String mSelectedIdentityKey;
+
+        public EmailListLoader(Context context, EmailFolder folder, String selectedIdentityKey) {
+            super(context);
+            mFolder = folder;
+            mSelectedIdentityKey = selectedIdentityKey;
+        }
+
+        @Override
+        public List<Email> loadInBackground() {
+            List<Email> emails = null;
+            try {
+                List<Email> allEmails = BoteHelper.getEmails(mFolder, null, true);
+
+                if (mSelectedIdentityKey != null) {
+                    emails = new ArrayList<>();
+
+                    for (Email email : allEmails) {
+                        boolean add = false;
+                        if (BoteHelper.isSentEmail(email)) {
+                            String senderDest = BoteHelper.extractEmailDestination(email.getOneFromAddress());
+                            if (mSelectedIdentityKey.equals(senderDest))
+                                add = true;
+                        } else {
+                            for (Address recipient : email.getAllRecipients()) {
+                                String recipientDest = BoteHelper.extractEmailDestination(recipient.toString());
+                                if (mSelectedIdentityKey.equals(recipientDest)) {
+                                    add = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if (add)
+                            emails.add(email);
+                    }
+                } else
+                    emails = allEmails;
+            } catch (PasswordException pe) {
+                // XXX: Should not get here.
+            } catch (MessagingException e) {
+                e.printStackTrace();
+            } catch (GeneralSecurityException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+            return emails;
+        }
+
+        protected void onStartMonitoring() {
+            mFolder.addFolderListener(this);
+        }
+
+        protected void onStopMonitoring() {
+            mFolder.removeFolderListener(this);
+        }
+
+        protected void releaseResources(List<Email> data) {
+        }
+
+        // FolderListener
+
+        @Override
+        public void elementAdded(String messageId) {
+            onContentChanged();
+        }
+
+        @Override
+        public void elementUpdated() {
+            onContentChanged();
+        }
+
+        @Override
+        public void elementRemoved(String messageId) {
+            onContentChanged();
+        }
+    }
+
+    public void onLoadFinished(Loader<List<Email>> loader,
+                               List<Email> data) {
+        // Clear recent flags
+        for (Email email : data)
+            try {
+                email.setFlag(Flag.RECENT, false);
+            } catch (MessagingException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        mAdapter.setEmails(data);
+        try {
+            getActivity().setTitle(
+                    BoteHelper.getFolderDisplayNameWithNew(getActivity(), mFolder));
+        } catch (PasswordException e) {
+            // Should not get here.
+            Log log = I2PAppContext.getGlobalContext().logManager().getLog(EmailListFragment.class);
+            if (log.shouldLog(Log.WARN))
+                log.warn("Email list loader finished, but password is no longer cached", e);
+        } catch (MessagingException | GeneralSecurityException | IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void onLoaderReset(Loader<List<Email>> loader) {
+        mAdapter.setEmails(null);
+        getActivity().setTitle(
+                BoteHelper.getFolderDisplayName(getActivity(), mFolder));
+    }
+
+    // SwipeRefreshLayout.OnRefreshListener
+
+    public void onRefresh() {
+        // If we are already checking, do nothing else
+        if (mCheckingTask != null)
+            return;
+
+        I2PBote bote = I2PBote.getInstance();
+        if (bote.isConnected()) {
+            try {
+                if (!bote.isCheckingForMail())
+                    bote.checkForMail();
+
+                mCheckingTask = new AsyncTask<Void, Void, Void>() {
+                    @Override
+                    protected Void doInBackground(Void... params) {
+                        while (I2PBote.getInstance().isCheckingForMail()) {
+                            try {
+                                Thread.sleep(100);
+                            } catch (InterruptedException e) {
+                            }
+                            if (isCancelled()) {
+                                break;
+                            }
+                        }
+                        return null;
+                    }
+
+                    @Override
+                    protected void onPostExecute(Void result) {
+                        super.onPostExecute(result);
+
+                        mAdapter.setIncompleteEmails(I2PBote.getInstance().getNumIncompleteEmails());
+
+                        // Notify PullToRefreshLayout that the refresh has finished
+                        mSwipeRefreshLayout.setRefreshing(false);
+                        getActivity().supportInvalidateOptionsMenu();
+                    }
+                };
+                mCheckingTask.execute();
+            } catch (PasswordException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            } catch (GeneralSecurityException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        } else {
+            mSwipeRefreshLayout.setRefreshing(false);
+            Toast.makeText(getActivity(), R.string.bote_needs_to_be_connected, Toast.LENGTH_SHORT).show();
+        }
+    }
+}

android/src/main/java/i2p/bote/android/HelpAboutFragment.java

@@ -0,0 +1,59 @@
+package i2p.bote.android;
+
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.sufficientlysecure.htmltextview.HtmlTextView;
+
+
+public class HelpAboutFragment extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_help_about, container, false);
+
+        TextView versionText = (TextView) view.findViewById(R.id.help_about_version);
+        versionText.setText(getString(R.string.version) + " " + getVersion());
+
+        TextView licenseText = (TextView) view.findViewById(R.id.help_about_license);
+        licenseText.setText(getString(R.string.license, "GPLv3+"));
+
+        HtmlTextView aboutLibsView = (HtmlTextView) view.findViewById(R.id.help_about_libraries);
+
+        // load html from raw resource (Parsing handled by HtmlTextView library)
+        aboutLibsView.setHtml(R.raw.help_about_libraries);
+
+        // no flickering when clicking textview for Android < 4
+        aboutLibsView.setTextColor(getResources().getColor(android.R.color.black));
+
+        return view;
+    }
+
+    /**
+     * Get the current package version.
+     *
+     * @return The current version.
+     */
+    private String getVersion() {
+        String result = "";
+        try {
+            PackageManager manager = getActivity().getPackageManager();
+            PackageInfo info = manager.getPackageInfo(getActivity().getPackageName(), 0);
+
+            result = String.format("%s (%s)", info.versionName, info.versionCode);
+        } catch (NameNotFoundException e) {
+            Log.w(Constants.ANDROID_LOG_TAG, "Unable to get application version: " + e.getMessage());
+            result = "Unable to get application version.";
+        }
+
+        return result;
+    }
+}

android/src/main/java/i2p/bote/android/HelpActivity.java

@@ -0,0 +1,98 @@
+package i2p.bote.android;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v7.widget.Toolbar;
+
+import com.viewpagerindicator.TitlePageIndicator;
+
+public class HelpActivity extends BoteActivityBase {
+    /**
+     * The {@link android.support.v4.view.PagerAdapter} that will provide
+     * fragments for each of the sections. We use a
+     * {@link FragmentPagerAdapter} derivative, which will keep every
+     * loaded fragment in memory. If this becomes too memory intensive, it
+     * may be best to switch to a
+     * {@link android.support.v4.app.FragmentStatePagerAdapter}.
+     */
+    SectionsPagerAdapter mSectionsPagerAdapter;
+
+    /**
+     * The {@link ViewPager} that will host the section contents.
+     */
+    ViewPager mViewPager;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_help);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
+        // Enable ActionBar app icon to behave as action to go back
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        // Create the sections adapter.
+        mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
+
+        // Set up the ViewPager with the sections adapter.
+        mViewPager = (ViewPager) findViewById(R.id.pager);
+        mViewPager.setAdapter(mSectionsPagerAdapter);
+
+        // Bind the page indicator to the pager.
+        TitlePageIndicator pageIndicator = (TitlePageIndicator) findViewById(R.id.page_indicator);
+        pageIndicator.setViewPager(mViewPager);
+    }
+
+
+    /**
+     * A {@link android.support.v4.app.FragmentPagerAdapter} that returns a fragment corresponding to
+     * one of the help sections.
+     */
+    public class SectionsPagerAdapter extends FragmentPagerAdapter {
+
+        public SectionsPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            switch (position) {
+                case 1:
+                    return getString(R.string.pref_title_identities);
+                case 2:
+                    return getString(R.string.changelog);
+                case 3:
+                    return getString(R.string.about);
+                case 0:
+                default:
+                    return getString(R.string.start);
+            }
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            switch (position) {
+                case 1:
+                    return HelpHtmlFragment.newInstance(R.raw.help_identities);
+                case 2:
+                    return HelpHtmlFragment.newInstance(R.raw.help_changelog);
+                case 3:
+                    return new HelpAboutFragment();
+                case 0:
+                default:
+                    return HelpHtmlFragment.newInstance(R.raw.help_start);
+            }
+        }
+
+        @Override
+        public int getCount() {
+            return 4;
+        }
+    }
+}

android/src/main/java/i2p/bote/android/HelpHtmlFragment.java

@@ -0,0 +1,35 @@
+package i2p.bote.android;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ScrollView;
+
+import org.sufficientlysecure.htmltextview.HtmlTextView;
+
+public class HelpHtmlFragment extends Fragment {
+    public static final String ARG_HTML_FILE = "htmlFile";
+
+    static HelpHtmlFragment newInstance(int htmlFile) {
+        HelpHtmlFragment f = new HelpHtmlFragment();
+        Bundle args = new Bundle();
+        args.putInt(ARG_HTML_FILE, htmlFile);
+        f.setArguments(args);
+        return f;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        ScrollView scroller = new ScrollView(getActivity());
+        HtmlTextView text = new HtmlTextView(getActivity());
+        scroller.addView(text);
+        int padH = getResources().getDimensionPixelOffset(R.dimen.activity_horizontal_margin);
+        int padV = getResources().getDimensionPixelOffset(R.dimen.activity_vertical_margin);
+        text.setPadding(padH, padV, padH, padV);
+        text.setHtml(getArguments().getInt(ARG_HTML_FILE));
+        text.setTextColor(getResources().getColor(R.color.primary_text_default_material_light));
+        return scroller;
+    }
+}

android/src/main/java/i2p/bote/android/InitActivities.java

@@ -0,0 +1,34 @@
+package i2p.bote.android;
+
+import android.content.Context;
+
+import java.security.Security;
+
+public class InitActivities {
+    static {
+        Security.insertProviderAt(new org.spongycastle.jce.provider.BouncyCastleProvider(), 1);
+    }
+
+    private final String myDir;
+
+    public InitActivities(Context c) {
+        this(c.getFilesDir().getAbsolutePath());
+    }
+
+    public InitActivities(String i2pBaseDir) {
+        myDir = i2pBaseDir;
+    }
+
+    public void initialize() {
+        // Don't initialize twice
+        if (System.getProperty("i2pbote.initialized", "false").equals("true"))
+            return;
+
+        // Set up the locations so settings can find them
+        System.setProperty("i2p.dir.base", myDir);
+        System.setProperty("i2p.dir.config", myDir);
+        System.setProperty("wrapper.logfile", myDir + "/wrapper.log");
+
+        System.setProperty("i2pbote.initialized", "true");
+    }
+}

android/src/main/java/i2p/bote/android/NetworkInfoActivity.java

@@ -0,0 +1,25 @@
+package i2p.bote.android;
+
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+
+public class NetworkInfoActivity extends BoteActivityBase {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_toolbar);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
+        // Enable ActionBar app icon to behave as action to go back
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        if (savedInstanceState == null) {
+            NetworkInfoFragment f = new NetworkInfoFragment();
+            getSupportFragmentManager().beginTransaction()
+                .add(R.id.container, f).commit();
+        }
+    }
+}

android/src/main/java/i2p/bote/android/NetworkInfoFragment.java

@@ -0,0 +1,234 @@
+package i2p.bote.android;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.androidplot.pie.PieChart;
+import com.androidplot.pie.Segment;
+import com.androidplot.pie.SegmentFormatter;
+
+import net.i2p.android.ui.I2PAndroidHelper;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Collection;
+import java.util.Set;
+
+import i2p.bote.I2PBote;
+import i2p.bote.network.BannedPeer;
+import i2p.bote.network.DhtPeerStats;
+import i2p.bote.network.DhtPeerStatsRow;
+import i2p.bote.network.RelayPeer;
+
+public class NetworkInfoFragment extends Fragment {
+    private Exception mConnectError;
+
+    private PieChart mKademliaPie;
+    private TextView mKademliaPeers;
+    private PieChart mRelayPie;
+    private TextView mRelayPeers;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        mConnectError = I2PBote.getInstance().getConnectError();
+        if (mConnectError == null)
+            return inflater.inflate(R.layout.fragment_network_info, container, false);
+        else
+            return inflater.inflate(R.layout.fragment_network_error, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        if (mConnectError == null) {
+            mKademliaPie = (PieChart) view.findViewById(R.id.kademlia_peers_pie);
+            mKademliaPeers = (TextView) view.findViewById(R.id.kademlia_peers);
+            mRelayPie = (PieChart) view.findViewById(R.id.relay_peers_pie);
+            mRelayPeers = (TextView) view.findViewById(R.id.relay_peers);
+
+            setupKademliaPeers();
+            setupRelayPeers();
+
+            Collection<BannedPeer> bannedPeers = I2PBote.getInstance().getBannedPeers();
+            ((TextView) view.findViewById(R.id.banned_peers)).setText(
+                    "" + bannedPeers.size());
+        } else {
+            ((TextView) view.findViewById(R.id.error)).setText(mConnectError.toString());
+
+            view.findViewById(R.id.copy_error).setOnClickListener(new View.OnClickListener() {
+                @SuppressWarnings("deprecation")
+                @Override
+                public void onClick(View view) {
+                    String fullError = joinStackTrace(mConnectError);
+                    Object clipboardService = getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
+                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+                        android.text.ClipboardManager clipboard = (android.text.ClipboardManager) clipboardService;
+                        clipboard.setText(fullError);
+                    } else {
+                        android.content.ClipboardManager clipboard = (android.content.ClipboardManager) clipboardService;
+                        android.content.ClipData clip = android.content.ClipData.newPlainText(
+                                getString(R.string.bote_connection_error), fullError);
+                        clipboard.setPrimaryClip(clip);
+                    }
+                    Toast.makeText(getActivity(), R.string.full_error_copied_to_clipboard, Toast.LENGTH_SHORT).show();
+                }
+            });
+
+            if ((new I2PAndroidHelper(getActivity())).isI2PAndroidInstalled())
+                view.findViewById(R.id.error_page_i2p_content).setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void setupSegmentFormatter(SegmentFormatter sf) {
+        sf.getLabelPaint().setTextSize(20);
+    }
+
+    private void setupKademliaPeers() {
+        DhtPeerStats dhtStats = I2PBote.getInstance().getDhtStats(new AndroidPeerStatsRenderer());
+        if (dhtStats != null) {
+            if (dhtStats.getData().size() == 0) {
+                Segment n = new Segment("", 100);
+
+                SegmentFormatter nf = new SegmentFormatter(getResources().getColor(android.R.color.darker_gray));
+                setupSegmentFormatter(nf);
+
+                mKademliaPie.addSeries(n, nf);
+            } else {
+                int reachable = 0;
+                for (DhtPeerStatsRow row : dhtStats.getData()) {
+                    if (row.isReachable())
+                        reachable += 1;
+                }
+                int unreachable = dhtStats.getData().size() - reachable;
+
+                mKademliaPeers.setText("" + dhtStats.getData().size());
+
+                if (reachable > 0) {
+                    Segment r = new Segment(getString(R.string.reachable), reachable);
+
+                    SegmentFormatter rf = new SegmentFormatter(getResources().getColor(R.color.green));
+                    setupSegmentFormatter(rf);
+
+                    mKademliaPie.addSeries(r, rf);
+                }
+
+                if (unreachable > 0) {
+                    Segment u = new Segment(getString(R.string.unreachable), dhtStats.getData().size() - reachable);
+
+                    SegmentFormatter uf = new SegmentFormatter(getResources().getColor(R.color.error_color));
+                    setupSegmentFormatter(uf);
+
+                    mKademliaPie.addSeries(u, uf);
+                }
+            }
+        }
+
+        mKademliaPie.getBorderPaint().setColor(Color.TRANSPARENT);
+        mKademliaPie.getBackgroundPaint().setColor(Color.TRANSPARENT);
+    }
+
+    private void setupRelayPeers() {
+        Set<RelayPeer> relayPeers = I2PBote.getInstance().getRelayPeers();
+        mRelayPeers.setText("" + relayPeers.size());
+
+        if (relayPeers.size() == 0) {
+            Segment n = new Segment("", 100);
+
+            SegmentFormatter nf = new SegmentFormatter(getResources().getColor(android.R.color.darker_gray));
+            setupSegmentFormatter(nf);
+
+            mRelayPie.addSeries(n, nf);
+        } else {
+            int good = 0;
+            int untested = 0;
+            for (RelayPeer relayPeer : relayPeers) {
+                int reachability = relayPeer.getReachability();
+                if (reachability == 0)
+                    untested += 1;
+                else if (reachability > 80)
+                    good += 1;
+            }
+            int bad = relayPeers.size() - good - untested;
+
+            if (good > 0) {
+                Segment g = new Segment(getString(R.string.good), good);
+
+                SegmentFormatter gf = new SegmentFormatter(getResources().getColor(R.color.green));
+                setupSegmentFormatter(gf);
+
+                mRelayPie.addSeries(g, gf);
+            }
+
+            if (bad > 0) {
+                Segment b = new Segment(getString(R.string.unreliable), bad);
+
+                SegmentFormatter bf = new SegmentFormatter(getResources().getColor(R.color.red));
+                setupSegmentFormatter(bf);
+
+                mRelayPie.addSeries(b, bf);
+            }
+
+            if (untested > 0) {
+                Segment u = new Segment(getString(R.string.untested), untested);
+
+                SegmentFormatter uf = new SegmentFormatter(getResources().getColor(R.color.accent));
+                setupSegmentFormatter(uf);
+
+                mRelayPie.addSeries(u, uf);
+            }
+        }
+
+        mRelayPie.getBorderPaint().setColor(Color.TRANSPARENT);
+        mRelayPie.getBackgroundPaint().setColor(Color.TRANSPARENT);
+    }
+
+    private static String joinStackTrace(Throwable e) {
+        StringWriter writer = null;
+        try {
+            writer = new StringWriter();
+            joinStackTrace(e, writer);
+            return writer.toString();
+        }
+        finally {
+            if (writer != null)
+                try {
+                    writer.close();
+                } catch (IOException e1) {
+                    // ignore
+                }
+        }
+    }
+
+    private static void joinStackTrace(Throwable e, StringWriter writer) {
+        PrintWriter printer = null;
+        try {
+            printer = new PrintWriter(writer);
+
+            while (e != null) {
+
+                printer.println(e);
+                StackTraceElement[] trace = e.getStackTrace();
+                for (StackTraceElement aTrace : trace) printer.println("\tat " + aTrace);
+
+                e = e.getCause();
+                if (e != null)
+                    printer.println("Caused by:\r\n");
+            }
+        }
+        finally {
+            if (printer != null)
+                printer.close();
+        }
+    }
+}

android/src/main/java/i2p/bote/android/NewEmailActivity.java

@@ -0,0 +1,57 @@
+package i2p.bote.android;
+
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.widget.Toast;
+
+public class NewEmailActivity extends BoteActivityBase implements
+        NewEmailFragment.Callbacks {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_toolbar);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
+        // Enable ActionBar app icon to behave as action to go back
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        if (savedInstanceState == null) {
+            NewEmailFragment f;
+            String quoteMsgFolder = null;
+            String quoteMsgId = null;
+            NewEmailFragment.QuoteMsgType quoteMsgType = null;
+            Bundle args = getIntent().getExtras();
+            if (args != null) {
+                quoteMsgFolder = args.getString(NewEmailFragment.QUOTE_MSG_FOLDER);
+                quoteMsgId = args.getString(NewEmailFragment.QUOTE_MSG_ID);
+                quoteMsgType =
+                        (NewEmailFragment.QuoteMsgType) args.getSerializable(NewEmailFragment.QUOTE_MSG_TYPE);
+            }
+            f = NewEmailFragment.newInstance(quoteMsgFolder, quoteMsgId, quoteMsgType);
+            getSupportFragmentManager().beginTransaction()
+                .add(R.id.container, f).commit();
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        NewEmailFragment f = (NewEmailFragment) getSupportFragmentManager().findFragmentById(R.id.container);
+        f.onBackPressed();
+    }
+
+    // NewEmailFragment.Callbacks
+
+    public void onTaskFinished() {
+        Toast.makeText(this, R.string.email_queued_for_sending,
+                Toast.LENGTH_SHORT).show();
+        finish();
+    }
+
+    @Override
+    public void onBackPressAllowed() {
+        super.onBackPressed();
+    }
+}

android/src/main/java/i2p/bote/android/NewEmailFragment.java

@@ -0,0 +1,712 @@
+package i2p.bote.android;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.mikepenz.google_material_typeface_library.GoogleMaterial;
+import com.mikepenz.iconics.IconicsDrawable;
+import com.tokenautocomplete.FilteredArrayAdapter;
+
+import net.i2p.data.DataFormatException;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+
+import javax.mail.Address;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+
+import i2p.bote.I2PBote;
+import i2p.bote.android.util.BoteHelper;
+import i2p.bote.android.util.ContentAttachment;
+import i2p.bote.android.util.Person;
+import i2p.bote.android.widget.ContactsCompletionView;
+import i2p.bote.email.Attachment;
+import i2p.bote.email.Email;
+import i2p.bote.email.EmailIdentity;
+import i2p.bote.fileencryption.PasswordException;
+import i2p.bote.packet.dht.Contact;
+
+public class NewEmailFragment extends Fragment {
+    private Callbacks mCallbacks = sDummyCallbacks;
+
+    public interface Callbacks {
+        public void onTaskFinished();
+
+        public void onBackPressAllowed();
+    }
+
+    private static Callbacks sDummyCallbacks = new Callbacks() {
+        public void onTaskFinished() {
+        }
+
+        public void onBackPressAllowed() {
+        }
+    };
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        if (!(activity instanceof Callbacks))
+            throw new IllegalStateException("Activity must implement fragment's callbacks.");
+        mCallbacks = (Callbacks) activity;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mCallbacks = sDummyCallbacks;
+    }
+
+    public static final String QUOTE_MSG_FOLDER = "sender";
+    public static final String QUOTE_MSG_ID = "recipient";
+
+    public static enum QuoteMsgType {
+        REPLY,
+        REPLY_ALL,
+        FORWARD
+    }
+
+    public static final String QUOTE_MSG_TYPE = "type";
+
+    private static final long MAX_RECOMMENDED_ATTACHMENT_SIZE = 1048576;
+
+    private static final int REQUEST_FILE = 1;
+
+    private String mSenderKey;
+
+    Spinner mSpinner;
+    int mDefaultPos;
+    ArrayAdapter<Person> mAdapter;
+    ImageView mMore;
+    ContactsCompletionView mTo;
+    ContactsCompletionView mCc;
+    ContactsCompletionView mBcc;
+    EditText mSubject;
+    EditText mContent;
+    LinearLayout mAttachments;
+    private long mTotalAttachmentSize;
+    private View mAttachmentSizeWarning;
+    boolean mMoreVisible;
+    boolean mDirty;
+
+    public static NewEmailFragment newInstance(String quoteMsgFolder, String quoteMsgId,
+                                               QuoteMsgType quoteMsgType) {
+        NewEmailFragment f = new NewEmailFragment();
+        Bundle args = new Bundle();
+        args.putString(QUOTE_MSG_FOLDER, quoteMsgFolder);
+        args.putString(QUOTE_MSG_ID, quoteMsgId);
+        args.putSerializable(QUOTE_MSG_TYPE, quoteMsgType);
+        f.setArguments(args);
+        return f;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_new_email, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        mSpinner = (Spinner) view.findViewById(R.id.sender_spinner);
+        mMore = (ImageView) view.findViewById(R.id.more);
+        mTo = (ContactsCompletionView) view.findViewById(R.id.to);
+        mCc = (ContactsCompletionView) view.findViewById(R.id.cc);
+        mBcc = (ContactsCompletionView) view.findViewById(R.id.bcc);
+        mSubject = (EditText) view.findViewById(R.id.subject);
+        mContent = (EditText) view.findViewById(R.id.message);
+        mAttachments = (LinearLayout) view.findViewById(R.id.attachments);
+
+        String quoteMsgFolder = getArguments().getString(QUOTE_MSG_FOLDER);
+        String quoteMsgId = getArguments().getString(QUOTE_MSG_ID);
+        QuoteMsgType quoteMsgType = (QuoteMsgType) getArguments().getSerializable(QUOTE_MSG_TYPE);
+        boolean hide = I2PBote.getInstance().getConfiguration().getHideLocale();
+
+        List<Person> toRecipients = new ArrayList<Person>();
+        List<Person> ccRecipients = new ArrayList<Person>();
+        String origSubject = null;
+        String origContent = null;
+        String origFrom = null;
+        try {
+            Email origEmail = BoteHelper.getEmail(quoteMsgFolder, quoteMsgId);
+
+            if (origEmail != null) {
+                mSenderKey = BoteHelper.extractEmailDestination(
+                        BoteHelper.getOneLocalRecipient(origEmail).toString());
+
+                if (quoteMsgType == QuoteMsgType.REPLY) {
+                    String recipient = BoteHelper.getNameAndDestination(
+                            origEmail.getReplyAddress(I2PBote.getInstance().getIdentities()));
+                    toRecipients.add(extractPerson(recipient));
+                } else if (quoteMsgType == QuoteMsgType.REPLY_ALL) {
+                    // TODO split between To and Cc
+                    // TODO don't include our address
+                    // What happens if an email is received by multiple local identities?
+                    for (Address address : origEmail.getAllAddresses(true)) {
+                        Person person = extractPerson(address.toString());
+                        if (person != null)
+                            toRecipients.add(person);
+                    }
+                }
+
+                origSubject = origEmail.getSubject();
+                origContent = origEmail.getText();
+                origFrom = BoteHelper.getShortSenderName(origEmail.getOneFromAddress(), 50);
+            }
+        } catch (PasswordException e) {
+            // Should not happen, we cannot get to this page without authenticating
+            e.printStackTrace();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (GeneralSecurityException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (MessagingException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+        // Set up identities spinner
+        IdentityAdapter identities = new IdentityAdapter(getActivity());
+        mSpinner.setAdapter(identities);
+        mSpinner.setSelection(mDefaultPos);
+
+        // Set up Cc/Bcc button
+        mMore.setImageDrawable(new IconicsDrawable(getActivity(), GoogleMaterial.Icon.gmd_unfold_more).colorRes(R.color.md_grey_600).sizeDp(24).paddingDp(3));
+        mMore.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mCc.setVisibility(mMoreVisible ? View.GONE : View.VISIBLE);
+                mBcc.setVisibility(mMoreVisible ? View.GONE : View.VISIBLE);
+                mMore.setImageDrawable(new IconicsDrawable(getActivity(), mMoreVisible ?
+                        GoogleMaterial.Icon.gmd_unfold_more : GoogleMaterial.Icon.gmd_unfold_less)
+                        .colorRes(R.color.md_grey_600)
+                        .sizeDp(24)
+                        .paddingDp(mMoreVisible ? 3 : 4));
+                mMoreVisible = !mMoreVisible;
+            }
+        });
+
+        // Set up contacts auto-complete
+        List<Person> contacts = new ArrayList<Person>();
+        try {
+            for (Contact contact : I2PBote.getInstance().getAddressBook().getAll()) {
+                contacts.add(new Person(contact.getName(), contact.getBase64Dest(),
+                        BoteHelper.decodePicture(contact.getPictureBase64())));
+            }
+        } catch (PasswordException e) {
+            // TODO handle
+            e.printStackTrace();
+        }
+        mAdapter = new FilteredArrayAdapter<Person>(getActivity(), android.R.layout.simple_list_item_1, contacts) {
+            @Override
+            protected boolean keepObject(Person obj, String mask) {
+                mask = mask.toLowerCase(Locale.US);
+                return obj.getName().toLowerCase(Locale.US).startsWith(mask) || obj.getAddress().toLowerCase(Locale.US).startsWith(mask);
+            }
+
+            @Override
+            public View getView(int position, View convertView, ViewGroup parent) {
+                View v;
+                if (convertView == null)
+                    v = ((LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE))
+                            .inflate(R.layout.listitem_contact, parent, false);
+                else
+                    v = convertView;
+                setViewContent(v, position);
+                return v;
+            }
+
+            private void setViewContent(View v, int position) {
+                Person person = getItem(position);
+                ((TextView) v.findViewById(R.id.contact_name)).setText(person.getName());
+                ImageView picView = (ImageView) v.findViewById(R.id.contact_picture);
+                Bitmap picture = person.getPicture();
+                if (picture == null) {
+                    ViewGroup.LayoutParams lp = picView.getLayoutParams();
+                    picture = BoteHelper.getIdenticonForAddress(person.getAddress(), lp.width, lp.height);
+                }
+                picView.setImageBitmap(picture);
+            }
+        };
+
+        mTo.setAdapter(mAdapter);
+        mCc.setAdapter(mAdapter);
+        mBcc.setAdapter(mAdapter);
+        for (Person recipient : toRecipients) {
+            mTo.addObject(recipient);
+        }
+        for (Person recipient : ccRecipients) {
+            mCc.addObject(recipient);
+        }
+
+        if (origSubject != null) {
+            String subjectPrefix;
+            if (quoteMsgType == QuoteMsgType.FORWARD) {
+                subjectPrefix = getResources().getString(
+                        hide ? R.string.subject_prefix_fwd_hide
+                                : R.string.subject_prefix_fwd);
+            } else {
+                subjectPrefix = getResources().getString(
+                        hide ? R.string.response_prefix_re_hide
+                                : R.string.response_prefix_re);
+            }
+            if (!origSubject.startsWith(subjectPrefix))
+                origSubject = subjectPrefix + " " + origSubject;
+            mSubject.setText(origSubject);
+        }
+        if (origContent != null) {
+            StringBuilder quotation = new StringBuilder();
+            quotation.append("\n\n");
+            quotation.append(getResources().getString(
+                    hide ? R.string.response_quote_wrote_hide
+                            : R.string.response_quote_wrote,
+                    origFrom));
+            String[] lines = origContent.split("\r?\n|\r");
+            for (String line : lines)
+                quotation = quotation.append("\n> ").append(line);
+            mContent.setText(quotation);
+        }
+
+        if (savedInstanceState == null) {
+            mTo.setPrefix(getResources().getString(R.string.email_to) + " ");
+            mCc.setPrefix(getResources().getString(R.string.email_cc) + " ");
+            mBcc.setPrefix(getResources().getString(R.string.email_bcc) + " ");
+        }
+
+        TextWatcher dirtyWatcher = new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                mDirty = true;
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+            }
+        };
+        mSubject.addTextChangedListener(dirtyWatcher);
+        mContent.addTextChangedListener(dirtyWatcher);
+    }
+
+    private Person extractPerson(String recipient) {
+        if (recipient.equals("Anonymous"))
+            return null;
+
+        String recipientName = BoteHelper.extractName(recipient);
+        try {
+            recipientName = BoteHelper.getName(recipient);
+        } catch (PasswordException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace();
+        }
+        String recipientAddr = BoteHelper.extractEmailDestination(recipient);
+
+        if (recipientAddr == null) { // Assume external address
+            recipientAddr = recipient;
+            if (recipientName.isEmpty())
+                recipientName = recipientAddr;
+            return new Person(recipientName, recipientAddr, null, true);
+        } else {
+            if (recipientName.isEmpty()) // Dest with no name
+                recipientName = recipientAddr.substring(0, 5);
+            Bitmap recipientPic = null;
+            try {
+                recipientPic = BoteHelper.getPictureForDestination(recipientAddr);
+            } catch (PasswordException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            } catch (GeneralSecurityException e) {
+                e.printStackTrace();
+            }
+            return new Person(recipientName, recipientAddr, recipientPic);
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.new_email, menu);
+        menu.findItem(R.id.action_attach_file).setIcon(BoteHelper.getMenuIcon(getActivity(), GoogleMaterial.Icon.gmd_attach_file));
+        menu.findItem(R.id.action_send_email).setIcon(BoteHelper.getMenuIcon(getActivity(), GoogleMaterial.Icon.gmd_send));
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(final MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_attach_file:
+                requestFile();
+                return true;
+
+            case R.id.action_send_email:
+                if (sendEmail())
+                    mCallbacks.onTaskFinished();
+                return true;
+
+            case android.R.id.home:
+                if (mDirty) {
+                    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+                    builder.setTitle(R.string.stop_composing_email)
+                            .setMessage(R.string.all_changes_will_be_discarded)
+                            .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialogInterface, int i) {
+                                    dialogInterface.dismiss();
+                                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN)
+                                        mCallbacks.onBackPressAllowed();
+                                    else
+                                        getActivity().onNavigateUp();
+                                }
+                            }).setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            dialogInterface.cancel();
+                        }
+                    }).show();
+                    return true;
+                } else
+                    return super.onOptionsItemSelected(item);
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private void requestFile() {
+        Intent i = new Intent(Intent.ACTION_GET_CONTENT);
+        i.setType("*/*");
+        i.addCategory(Intent.CATEGORY_OPENABLE);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2)
+            i.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
+        startActivityForResult(
+                Intent.createChooser(i,
+                        getResources().getString(R.string.select_attachment)),
+                REQUEST_FILE);
+    }
+
+    @SuppressLint("NewApi")
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode != Activity.RESULT_OK) {
+            if (resultCode == Activity.RESULT_CANCELED) {
+                System.out.println("Cancelled");
+            }
+            return;
+        }
+
+        switch (requestCode) {
+            case REQUEST_FILE:
+                addAttachment(data.getData());
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2 &&
+                        data.getClipData() != null) {
+                    ClipData clipData = data.getClipData();
+                    for (int i = 0; i < clipData.getItemCount(); i++) {
+                        addAttachment(clipData.getItemAt(i).getUri());
+                    }
+                }
+                break;
+        }
+    }
+
+    private void addAttachment(Uri uri) {
+        // Try to create a ContentAttachment using the provided Uri.
+        try {
+            final ContentAttachment attachment = new ContentAttachment(getActivity(), uri);
+            final View v = getActivity().getLayoutInflater().inflate(R.layout.listitem_attachment, mAttachments, false);
+            v.setTag(attachment);
+            ((TextView) v.findViewById(R.id.filename)).setText(attachment.getFileName());
+            ((TextView) v.findViewById(R.id.size)).setText(attachment.getHumanReadableSize());
+            ImageView attachmentAction = (ImageView) v.findViewById(R.id.attachment_action);
+            attachmentAction.setImageDrawable(new IconicsDrawable(getActivity(), GoogleMaterial.Icon.gmd_clear).colorRes(R.color.md_grey_600).sizeDp(24).paddingDp(5));
+            attachmentAction.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    updateAttachmentSizeCount(attachment.getSize(), false);
+                    attachment.clean();
+                    mAttachments.removeView(v);
+                }
+            });
+            mAttachments.addView(v);
+            updateAttachmentSizeCount(attachment.getSize(), true);
+        } catch (IllegalArgumentException iae) {
+            Log.e(Constants.ANDROID_LOG_TAG, "Failed to get attachment", iae);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+            Log.e(Constants.ANDROID_LOG_TAG, "File not found: " + uri);
+        }
+    }
+
+    private void updateAttachmentSizeCount(long size, boolean increase) {
+        if (increase) {
+            mTotalAttachmentSize += size;
+            if (mTotalAttachmentSize > MAX_RECOMMENDED_ATTACHMENT_SIZE &&
+                    mAttachmentSizeWarning == null) {
+                mAttachmentSizeWarning = getActivity().getLayoutInflater().inflate(
+                        R.layout.listitem_attachment_warning, mAttachments, false);
+                TextView warning = (TextView) mAttachmentSizeWarning.findViewById(
+                        R.id.attachment_warning_text);
+                warning.setText(
+                        getString(R.string.attachment_size_warning,
+                                BoteHelper.getHumanReadableSize(
+                                        getActivity(), MAX_RECOMMENDED_ATTACHMENT_SIZE))
+                );
+                mAttachments.addView(mAttachmentSizeWarning, 0);
+            }
+        } else {
+            mTotalAttachmentSize -= size;
+            if (mTotalAttachmentSize <= MAX_RECOMMENDED_ATTACHMENT_SIZE &&
+                    mAttachmentSizeWarning != null) {
+                mAttachments.removeView(mAttachmentSizeWarning);
+                mAttachmentSizeWarning = null;
+            }
+        }
+    }
+
+    private boolean sendEmail() {
+        Email email = new Email(I2PBote.getInstance().getConfiguration().getIncludeSentTime());
+        try {
+            // Set sender
+            EmailIdentity sender = (EmailIdentity) mSpinner.getSelectedItem();
+            InternetAddress ia = new InternetAddress(
+                    sender == null ? "Anonymous" :
+                            BoteHelper.getNameAndDestination(sender.getKey()));
+            email.setFrom(ia);
+            // We must continue to set "Sender:" even with only one mailbox
+            // in "From:", which is against RFC 2822 but required for older
+            // Bote versions to see a sender (and validate the signature).
+            email.setSender(ia);
+
+            for (Object obj : mTo.getObjects()) {
+                Person person = (Person) obj;
+                email.addRecipient(Message.RecipientType.TO, new InternetAddress(
+                        person.getAddress(), person.getName()));
+            }
+            if (mMoreVisible) {
+                for (Object obj : mCc.getObjects()) {
+                    Person person = (Person) obj;
+                    email.addRecipient(Message.RecipientType.CC, new InternetAddress(
+                            person.getAddress(), person.getName()));
+                }
+                for (Object obj : mBcc.getObjects()) {
+                    Person person = (Person) obj;
+                    email.addRecipient(Message.RecipientType.BCC, new InternetAddress(
+                            person.getAddress(), person.getName()));
+                }
+            }
+
+            // Check that we have someone to send to
+            Address[] rcpts = email.getAllRecipients();
+            if (rcpts == null || rcpts.length == 0) {
+                // No recipients
+                mTo.setError(getActivity().getString(R.string.add_one_recipient));
+                mTo.requestFocus();
+                return false;
+            } else {
+                mTo.setError(null);
+            }
+
+            email.setSubject(mSubject.getText().toString(), "UTF-8");
+
+            // Extract the attachments
+            List<Attachment> attachments = new ArrayList<Attachment>();
+            for (int i = 0; i < mAttachments.getChildCount(); i++) {
+                View v = mAttachments.getChildAt(i);
+                // Warning views don't have tags set
+                if (v.getTag() != null)
+                    attachments.add((Attachment) v.getTag());
+            }
+
+            // Set the text and add attachments
+            email.setContent(mContent.getText().toString(), attachments);
+
+            // Cache the fact that we sent this email
+            BoteHelper.setEmailSent(email, true);
+
+            // Send the email
+            I2PBote.getInstance().sendEmail(email);
+
+            // Clean up attachments
+            for (Attachment attachment : attachments) {
+                if (!attachment.clean())
+                    Log.e(Constants.ANDROID_LOG_TAG, "Can't clean up attachment: <" + attachment + ">");
+            }
+
+            return true;
+        } catch (PasswordException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (AddressException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (MessagingException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (GeneralSecurityException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    private class IdentityAdapter extends ArrayAdapter<EmailIdentity> {
+        private LayoutInflater mInflater;
+
+        public IdentityAdapter(Context context) {
+            super(context, android.R.layout.simple_spinner_item);
+            mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+            try {
+                Collection<EmailIdentity> identities = I2PBote.getInstance().getIdentities().getAll();
+                mDefaultPos = 0;
+                String selectedIdentity = getActivity().getSharedPreferences(Constants.SHARED_PREFS, 0)
+                        .getString(Constants.PREF_SELECTED_IDENTITY, null);
+                for (EmailIdentity identity : identities) {
+                    add(identity);
+                    boolean isDefaultIdentity = selectedIdentity == null ?
+                            identity.isDefaultIdentity() :
+                            identity.getKey().equals(selectedIdentity);
+                    boolean selectByDefault = mSenderKey == null ?
+                            isDefaultIdentity :
+                            identity.getKey().equals(mSenderKey);
+                    if (selectByDefault)
+                        mDefaultPos = getPosition(identity);
+                }
+            } catch (PasswordException e) {
+                // TODO Handle
+                e.printStackTrace();
+            } catch (IOException e) {
+                // TODO Handle
+                e.printStackTrace();
+            } catch (GeneralSecurityException e) {
+                // TODO Handle
+                e.printStackTrace();
+            }
+        }
+
+        @Override
+        public EmailIdentity getItem(int position) {
+            if (position > 0)
+                return super.getItem(position - 1);
+            else
+                return null;
+        }
+
+        @Override
+        public int getPosition(EmailIdentity item) {
+            if (item != null)
+                return super.getPosition(item) + 1;
+            else
+                return 0;
+        }
+
+        @Override
+        public int getCount() {
+            return super.getCount() + 1;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            View v;
+            if (convertView == null)
+                v = mInflater.inflate(android.R.layout.simple_spinner_item, parent, false);
+            else
+                v = convertView;
+
+            setViewText(v, position);
+            return v;
+        }
+
+        @Override
+        public View getDropDownView(int position, View convertView, ViewGroup parent) {
+            View v;
+            if (convertView == null)
+                v = mInflater.inflate(android.R.layout.simple_spinner_dropdown_item, parent, false);
+            else
+                v = convertView;
+
+            setViewText(v, position);
+            return v;
+        }
+
+        private void setViewText(View v, int position) {
+            TextView text = (TextView) v.findViewById(android.R.id.text1);
+            EmailIdentity identity = getItem(position);
+            if (identity == null)
+                text.setText("Anonymous");
+            else
+                text.setText(identity.getPublicName());
+        }
+    }
+
+    public void onBackPressed() {
+        if (mDirty) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+            builder.setTitle(R.string.stop_composing_email)
+                    .setMessage(R.string.all_changes_will_be_discarded)
+                    .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            dialogInterface.dismiss();
+                            mCallbacks.onBackPressAllowed();
+                        }
+                    }).setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialogInterface, int i) {
+                    dialogInterface.cancel();
+                }
+            }).show();
+        } else
+            mCallbacks.onBackPressAllowed();
+    }
+}

android/src/main/java/i2p/bote/android/ViewEmailActivity.java

@@ -0,0 +1,215 @@
+package i2p.bote.android;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.app.LoaderManager;
+import android.support.v4.content.Loader;
+import android.support.v4.view.ViewPager;
+import android.support.v7.widget.Toolbar;
+
+import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.List;
+
+import i2p.bote.android.util.BetterAsyncTaskLoader;
+import i2p.bote.android.util.BoteHelper;
+import i2p.bote.email.Email;
+import i2p.bote.fileencryption.PasswordException;
+import i2p.bote.folder.EmailFolder;
+import i2p.bote.folder.FolderListener;
+
+public class ViewEmailActivity extends BoteActivityBase implements
+        LoaderManager.LoaderCallbacks<List<String>> {
+    public static final String FOLDER_NAME = "folder_name";
+    public static final String MESSAGE_ID = "message_id";
+
+    private static final int MESSAGE_ID_LIST_LOADER = 1;
+
+    private EmailFolder mFolder;
+    // The messageId of the currently-viewed Email
+    private String mMessageId;
+    private ViewPager mPager;
+    private ViewEmailPagerAdapter mPagerAdapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_view_email);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
+        // Enable ActionBar app icon to behave as action to go back
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
+
+        Intent i = getIntent();
+        String folderName = i.getStringExtra(FOLDER_NAME);
+        mFolder = BoteHelper.getMailFolder(
+                folderName == null ? "inbox" : folderName);
+        mMessageId = i.getStringExtra(MESSAGE_ID);
+
+        // Instantiate the ViewPager and PagerAdapter
+        mPager = (ViewPager) findViewById(R.id.pager);
+        mPagerAdapter = new ViewEmailPagerAdapter(getSupportFragmentManager());
+        mPager.setAdapter(mPagerAdapter);
+        mPager.setOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
+
+            @Override
+            public void onPageSelected(int position) {
+                mMessageId = mPagerAdapter.getMessageId(position);
+
+                // Mark the visible email as not new
+                if (mMessageId != null) {
+                    try {
+                        if (!BoteHelper.isOutbox(mFolder))
+                            mFolder.setNew(mMessageId, false);
+                        mFolder.setRecent(mMessageId, false);
+                    } catch (PasswordException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    } catch (GeneralSecurityException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                }
+            }
+        });
+
+        // Fire off a Loader to fetch the list of Emails
+        getSupportLoaderManager().initLoader(MESSAGE_ID_LIST_LOADER, null, this);
+    }
+
+    private class ViewEmailPagerAdapter extends FragmentStatePagerAdapter {
+        private List<String> mIds;
+
+        public ViewEmailPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        public void setData(List<String> data) {
+            mIds = data;
+            notifyDataSetChanged();
+        }
+
+        public int getPosition(String messageId) {
+            if (mIds == null)
+                return 0;
+            else
+                return mIds.indexOf(messageId);
+        }
+
+        public String getMessageId(int position) {
+            if (mIds == null)
+                return null;
+            else
+                return mIds.get(position);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            if (mIds == null)
+                return null;
+            else
+                return ViewEmailFragment.newInstance(
+                        mFolder.getName(), mIds.get(position));
+        }
+
+        @Override
+        public int getCount() {
+            if (mIds == null)
+                return 0;
+            else
+                return mIds.size();
+        }
+    }
+
+    // LoaderManager.LoaderCallbacks<List<String>>
+
+    public Loader<List<String>> onCreateLoader(int id, Bundle args) {
+        return new MessageIdListLoader(this, mFolder);
+    }
+
+    private static class MessageIdListLoader extends BetterAsyncTaskLoader<List<String>> implements
+    FolderListener {
+        private EmailFolder mFolder;
+
+        public MessageIdListLoader(Context context, EmailFolder folder) {
+            super(context);
+            mFolder = folder;
+        }
+
+        @Override
+        public List<String> loadInBackground() {
+            List<String> messageIds = null;
+            try {
+                List<Email> emails = BoteHelper.getEmails(mFolder, null, true);
+                messageIds = new ArrayList<String>();
+                for (Email email : emails)
+                    messageIds.add(email.getMessageID());
+            } catch (PasswordException pe) {
+                // TODO: Handle this error properly (get user to log in)
+            }
+            return messageIds;
+        }
+
+        protected void onStartMonitoring() {
+            mFolder.addFolderListener(this);
+        }
+
+        protected void onStopMonitoring() {
+            mFolder.removeFolderListener(this);
+        }
+
+        protected void releaseResources(List<String> data) {
+        }
+
+        // FolderListener
+
+        @Override
+        public void elementAdded(String messageId) {
+            onContentChanged();
+        }
+
+        @Override
+        public void elementUpdated() {
+            onContentChanged();
+        }
+
+        @Override
+        public void elementRemoved(String messageId) {
+            onContentChanged();
+        }
+    }
+
+    public void onLoadFinished(Loader<List<String>> loader,
+            List<String> data) {
+        mPagerAdapter.setData(data);
+        mPager.setCurrentItem(
+                mPagerAdapter.getPosition(mMessageId));
+
+        // Mark the current email as not new
+        if (mMessageId != null) {
+            try {
+                if (!BoteHelper.isOutbox(mFolder))
+                    mFolder.setNew(mMessageId, false);
+                mFolder.setRecent(mMessageId, false);
+            } catch (PasswordException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            } catch (GeneralSecurityException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public void onLoaderReset(Loader<List<String>> loader) {
+        mPagerAdapter.setData(null);
+    }
+}

android/src/main/java/i2p/bote/android/ViewEmailFragment.java

@@ -0,0 +1,324 @@
+package i2p.bote.android;
+
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Typeface;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.PopupMenu;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.mikepenz.google_material_typeface_library.GoogleMaterial;
+import com.mikepenz.iconics.IconicsDrawable;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.text.DateFormat;
+import java.util.List;
+
+import javax.mail.Address;
+import javax.mail.MessagingException;
+import javax.mail.Part;
+
+import i2p.bote.android.provider.AttachmentProvider;
+import i2p.bote.android.util.BoteHelper;
+import i2p.bote.android.util.ContentAttachment;
+import i2p.bote.email.Attachment;
+import i2p.bote.email.Email;
+import i2p.bote.fileencryption.PasswordException;
+
+public class ViewEmailFragment extends Fragment {
+    private String mFolderName;
+    private String mMessageId;
+
+    private boolean mIsAnonymous;
+
+    public static ViewEmailFragment newInstance(
+            String folderName, String messageId) {
+        ViewEmailFragment f = new ViewEmailFragment();
+
+        Bundle args = new Bundle();
+        args.putString("folderName", folderName);
+        args.putString("messageId", messageId);
+        f.setArguments(args);
+
+        return f;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+        mFolderName = getArguments() != null ? getArguments().getString("folderName") : "inbox";
+        mMessageId = getArguments() != null ? getArguments().getString("messageId") : "1";
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.fragment_view_email, container, false);
+
+        try {
+            Email e = BoteHelper.getEmail(mFolderName, mMessageId);
+            if (e != null) {
+                displayEmail(e, v);
+            } else {
+                TextView subject = (TextView) v.findViewById(R.id.email_subject);
+                subject.setText(R.string.email_not_found);
+            }
+        } catch (PasswordException e) {
+            // TODO: Handle
+            e.printStackTrace();
+        }
+
+        return v;
+    }
+
+    private void displayEmail(Email email, View v) {
+        View sigInvalid = v.findViewById(R.id.signature_invalid);
+        TextView subject = (TextView) v.findViewById(R.id.email_subject);
+        ImageView picture = (ImageView) v.findViewById(R.id.picture);
+        TextView sender = (TextView) v.findViewById(R.id.email_sender);
+        LinearLayout toRecipients = (LinearLayout) v.findViewById(R.id.email_to);
+        TextView sent = (TextView) v.findViewById(R.id.email_sent);
+        TextView received = (TextView) v.findViewById(R.id.email_received);
+        TextView content = (TextView) v.findViewById(R.id.email_content);
+        LinearLayout attachments = (LinearLayout) v.findViewById(R.id.attachments);
+
+        try {
+            String fromAddress = email.getOneFromAddress();
+
+            subject.setText(email.getSubject());
+
+            Bitmap pic = BoteHelper.getPictureForAddress(fromAddress);
+            if (pic != null)
+                picture.setImageBitmap(pic);
+            else if (!email.isAnonymous()) {
+                ViewGroup.LayoutParams lp = picture.getLayoutParams();
+                picture.setImageBitmap(BoteHelper.getIdenticonForAddress(fromAddress, lp.width, lp.height));
+            }
+
+            final String senderDisplay = BoteHelper.getDisplayAddress(fromAddress);
+
+            if (!email.isSignatureValid() && !email.isAnonymous()) {
+                sigInvalid.setVisibility(View.VISIBLE);
+                sigInvalid.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        Toast.makeText(getActivity(), getString(R.string.signature_invalid, senderDisplay), Toast.LENGTH_LONG).show();
+                    }
+                });
+            }
+
+            sender.setText(senderDisplay);
+            if (email.isAnonymous() && !BoteHelper.isSentEmail(email))
+                sender.setTypeface(Typeface.DEFAULT, Typeface.ITALIC);
+
+            Address[] emailToRecipients = email.getToAddresses();
+            if (emailToRecipients != null) {
+                for (Address recipient : emailToRecipients) {
+                    TextView tv = new TextView(getActivity());
+                    tv.setText(BoteHelper.getDisplayAddress(recipient.toString()));
+                    tv.setTextAppearance(getActivity(), R.style.TextAppearance_AppCompat_Secondary);
+                    toRecipients.addView(tv);
+                }
+            }
+
+            Address[] emailCcRecipients = email.getCCAddresses();
+            if (emailCcRecipients != null) {
+                v.findViewById(R.id.email_cc_row).setVisibility(View.VISIBLE);
+                LinearLayout ccRecipients = (LinearLayout) v.findViewById(R.id.email_cc);
+                for (Address recipient : emailCcRecipients) {
+                    TextView tv = new TextView(getActivity());
+                    tv.setText(BoteHelper.getDisplayAddress(recipient.toString()));
+                    tv.setTextAppearance(getActivity(), R.style.TextAppearance_AppCompat_Secondary);
+                    ccRecipients.addView(tv);
+                }
+            }
+
+            Address[] emailBccRecipients = email.getBCCAddresses();
+            if (emailBccRecipients != null) {
+                v.findViewById(R.id.email_bcc_row).setVisibility(View.VISIBLE);
+                LinearLayout bccRecipients = (LinearLayout) v.findViewById(R.id.email_bcc);
+                for (Address recipient : emailBccRecipients) {
+                    TextView tv = new TextView(getActivity());
+                    tv.setText(BoteHelper.getDisplayAddress(recipient.toString()));
+                    tv.setTextAppearance(getActivity(), R.style.TextAppearance_AppCompat_Secondary);
+                    bccRecipients.addView(tv);
+                }
+            }
+
+            if (email.getSentDate() != null)
+                sent.setText(DateFormat.getInstance().format(
+                        email.getSentDate()));
+
+            if (email.getReceivedDate() != null)
+                received.setText(DateFormat.getInstance().format(
+                        email.getReceivedDate()));
+
+            content.setText(email.getText());
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+                content.setTextIsSelectable(true);
+
+            List<Part> parts = email.getParts();
+            for (int partIndex = 0; partIndex < parts.size(); partIndex++) {
+                Part part = parts.get(partIndex);
+                if (Part.ATTACHMENT.equalsIgnoreCase(part.getDisposition())) {
+                    final ContentAttachment attachment = new ContentAttachment(getActivity(), part);
+
+                    View a = getActivity().getLayoutInflater().inflate(R.layout.listitem_attachment, attachments, false);
+                    ((TextView) a.findViewById(R.id.filename)).setText(attachment.getFileName());
+                    ((TextView) a.findViewById(R.id.size)).setText(attachment.getHumanReadableSize());
+
+                    final ImageView action = (ImageView) a.findViewById(R.id.attachment_action);
+                    action.setImageDrawable(new IconicsDrawable(getActivity(), GoogleMaterial.Icon.gmd_more_vert).colorRes(R.color.md_grey_600).sizeDp(24).paddingDp(4));
+                    action.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            PopupMenu popup = new PopupMenu(getActivity(), action);
+                            popup.inflate(R.menu.attachment);
+                            popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                                @Override
+                                public boolean onMenuItemClick(MenuItem menuItem) {
+                                    switch (menuItem.getItemId()) {
+                                        case R.id.save_attachment:
+                                            saveAttachment(attachment);
+                                            return true;
+                                        default:
+                                            return false;
+                                    }
+                                }
+                            });
+                            popup.show();
+                        }
+                    });
+
+                    final Intent i = new Intent(Intent.ACTION_VIEW);
+                    i.setData(AttachmentProvider.getUriForAttachment(mFolderName, mMessageId, partIndex));
+                    i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION |
+                            Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+                    a.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            startActivity(i);
+                        }
+                    });
+
+                    attachments.addView(a);
+                }
+            }
+
+            // Prepare fields for replying
+            mIsAnonymous = email.isAnonymous();
+        } catch (MessagingException e) {
+            // TODO Handle
+            e.printStackTrace();
+        } catch (PasswordException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (GeneralSecurityException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+        if (BoteHelper.isOutbox(mFolderName)) {
+            ((TextView) v.findViewById(R.id.email_status)).setText(
+                    BoteHelper.getEmailStatusText(getActivity(), email, true));
+            v.findViewById(R.id.email_status_row).setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void saveAttachment(Attachment attachment) {
+        File downloadsDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+        String fileName = attachment.getFileName();
+        int extInd = fileName.lastIndexOf('.');
+        String name = fileName.substring(0, extInd);
+        String ext = fileName.substring(extInd);
+        File outFile = new File(downloadsDir, fileName);
+        for (int i = 1; outFile.exists() && i < 32; i++) {
+            fileName = name + "-" + i + ext;
+            outFile = new File(downloadsDir, fileName);
+        }
+        if (outFile.exists()) {
+            Toast.makeText(getActivity(), R.string.file_exists_in_downloads, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        FileOutputStream out = null;
+        try {
+            out = new FileOutputStream(outFile);
+            attachment.getDataHandler().writeTo(out);
+            Toast.makeText(getActivity(),
+                    getResources().getString(R.string.saved_to_downloads, fileName),
+                    Toast.LENGTH_SHORT).show();
+        } catch (IOException e) {
+            e.printStackTrace();
+            Toast.makeText(getActivity(), R.string.could_not_save_to_downloads, Toast.LENGTH_SHORT).show();
+        } finally {
+            if (out != null) {
+                try {
+                    out.close();
+                } catch (IOException e) {
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.view_email, menu);
+        MenuItem reply = menu.findItem(R.id.action_reply);
+
+        reply.setIcon(BoteHelper.getMenuIcon(getActivity(), GoogleMaterial.Icon.gmd_reply));
+        menu.findItem(R.id.action_reply_all).setIcon(BoteHelper.getMenuIcon(getActivity(), GoogleMaterial.Icon.gmd_reply_all));
+        menu.findItem(R.id.action_forward).setIcon(BoteHelper.getMenuIcon(getActivity(), GoogleMaterial.Icon.gmd_forward));
+
+        if (mIsAnonymous)
+            reply.setVisible(false);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_reply:
+            case R.id.action_reply_all:
+            case R.id.action_forward:
+                Intent nei = new Intent(getActivity(), NewEmailActivity.class);
+                nei.putExtra(NewEmailFragment.QUOTE_MSG_FOLDER, mFolderName);
+                nei.putExtra(NewEmailFragment.QUOTE_MSG_ID, mMessageId);
+                NewEmailFragment.QuoteMsgType type = null;
+                switch (item.getItemId()) {
+                    case R.id.action_reply:
+                        type = NewEmailFragment.QuoteMsgType.REPLY;
+                        break;
+                    case R.id.action_reply_all:
+                        type = NewEmailFragment.QuoteMsgType.REPLY_ALL;
+                        break;
+                    case R.id.action_forward:
+                        type = NewEmailFragment.QuoteMsgType.FORWARD;
+                }
+                nei.putExtra(NewEmailFragment.QUOTE_MSG_TYPE, type);
+                startActivity(nei);
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+}

android/src/main/java/i2p/bote/android/addressbook/AddressBookActivity.java

@@ -0,0 +1,73 @@
+package i2p.bote.android.addressbook;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+
+import com.google.zxing.integration.android.IntentIntegrator;
+import com.google.zxing.integration.android.IntentResult;
+
+import i2p.bote.android.BoteActivityBase;
+import i2p.bote.android.Constants;
+import i2p.bote.android.R;
+import i2p.bote.packet.dht.Contact;
+
+public class AddressBookActivity extends BoteActivityBase implements
+        AddressBookFragment.OnContactSelectedListener {
+    static final int ALTER_CONTACT_LIST = 1;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_toolbar);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
+        // Enable ActionBar app icon to behave as action to go back
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        if (savedInstanceState == null) {
+            AddressBookFragment f = new AddressBookFragment();
+            getSupportFragmentManager().beginTransaction()
+                .add(R.id.container, f).commit();
+        }
+    }
+
+    @Override
+    public void onContactSelected(Contact contact) {
+        if (Intent.ACTION_PICK.equals(getIntent().getAction())) {
+            Intent result = new Intent();
+            result.putExtra(ViewContactFragment.ADDRESS, contact.getBase64Dest());
+            setResult(Activity.RESULT_OK, result);
+            finish();
+        } else {
+            Intent i = new Intent(this, ViewContactActivity.class);
+            i.putExtra(ViewContactFragment.ADDRESS, contact.getBase64Dest());
+            startActivityForResult(i, ALTER_CONTACT_LIST);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
+        if (scanResult != null) {
+            String content = scanResult.getContents();
+            if (content != null && content.startsWith(Constants.EMAILDEST_SCHEME)) {
+                String destination = content.substring(Constants.EMAILDEST_SCHEME.length() + 1);
+                Intent nci = new Intent(this, EditContactActivity.class);
+                nci.putExtra(EditContactFragment.NEW_DESTINATION, destination);
+                startActivityForResult(nci, ALTER_CONTACT_LIST);
+            }
+        } else if (requestCode == ALTER_CONTACT_LIST) {
+            if (resultCode == Activity.RESULT_OK) {
+                AddressBookFragment f = (AddressBookFragment) getSupportFragmentManager().findFragmentById(R.id.container);
+                f.updateContactList();
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+}

android/src/main/java/i2p/bote/android/addressbook/AddressBookFragment.java

@@ -0,0 +1,219 @@
+package i2p.bote.android.addressbook;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.LoaderManager;
+import android.support.v4.content.Loader;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+
+import com.google.zxing.integration.android.IntentIntegrator;
+import com.pnikosis.materialishprogress.ProgressWheel;
+
+import java.util.SortedSet;
+
+import i2p.bote.I2PBote;
+import i2p.bote.android.R;
+import i2p.bote.android.util.AuthenticatedFragment;
+import i2p.bote.android.util.BetterAsyncTaskLoader;
+import i2p.bote.android.widget.DividerItemDecoration;
+import i2p.bote.android.widget.LoadingRecyclerView;
+import i2p.bote.fileencryption.PasswordException;
+import i2p.bote.packet.dht.Contact;
+
+public class AddressBookFragment extends AuthenticatedFragment implements
+        LoaderManager.LoaderCallbacks<SortedSet<Contact>> {
+    OnContactSelectedListener mCallback;
+    private LoadingRecyclerView mContactsList;
+    private ContactAdapter mAdapter;
+
+    private View mPromotedActions;
+
+    // Container Activity must implement this interface
+    public interface OnContactSelectedListener {
+        public void onContactSelected(Contact contact);
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+
+        // This makes sure that the container activity has implemented
+        // the callback interface. If not, it throws an exception
+        try {
+            mCallback = (OnContactSelectedListener) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity.toString()
+                    + " must implement OnContactSelectedListener");
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // Only so we can show/hide the FAM
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public View onCreateAuthenticatedView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.fragment_list_contacts, container, false);
+
+        mContactsList = (LoadingRecyclerView) v.findViewById(R.id.contacts_list);
+        View empty = v.findViewById(R.id.empty);
+        ProgressWheel loading = (ProgressWheel) v.findViewById(R.id.loading);
+        mContactsList.setLoadingView(empty, loading);
+        mPromotedActions = v.findViewById(R.id.promoted_actions);
+
+        ImageButton b = (ImageButton) v.findViewById(R.id.action_new_contact);
+        b.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startNewContact();
+            }
+        });
+
+        b = (ImageButton) v.findViewById(R.id.action_scan_qr_code);
+        b.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startScanQrCode();
+            }
+        });
+
+        return v;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        mContactsList.setHasFixedSize(true);
+        mContactsList.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
+
+        // Use a linear layout manager
+        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity());
+        mContactsList.setLayoutManager(mLayoutManager);
+
+        // Set the adapter for the list view
+        mAdapter = new ContactAdapter(getActivity(), mCallback);
+        mContactsList.setAdapter(mAdapter);
+    }
+
+    /**
+     * Start loading the address book.
+     * Only called when we have a password cached, or no
+     * password is required.
+     */
+    protected void onInitializeFragment() {
+        getLoaderManager().initLoader(0, null, this);
+    }
+
+    protected void onDestroyFragment() {
+        getLoaderManager().destroyLoader(0);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.address_book, menu);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        boolean passwordRequired = I2PBote.getInstance().isPasswordRequired();
+        menu.findItem(R.id.export_address_book).setVisible(!passwordRequired);
+        menu.findItem(R.id.import_address_book).setVisible(!passwordRequired);
+        mPromotedActions.setVisibility(passwordRequired ? View.GONE : View.VISIBLE);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.export_address_book:
+                Intent ei = new Intent(getActivity(), AddressBookShipActivity.class);
+                ei.putExtra(AddressBookShipActivity.EXPORTING, true);
+                startActivity(ei);
+                return true;
+            case R.id.import_address_book:
+                Intent ii = new Intent(getActivity(), AddressBookShipActivity.class);
+                ii.putExtra(AddressBookShipActivity.EXPORTING, false);
+                startActivity(ii);
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private void startNewContact() {
+        Intent nci = new Intent(getActivity(), EditContactActivity.class);
+        getActivity().startActivityForResult(nci, AddressBookActivity.ALTER_CONTACT_LIST);
+    }
+
+    private void startScanQrCode() {
+        IntentIntegrator integrator = new IntentIntegrator(getActivity());
+        integrator.initiateScan(IntentIntegrator.QR_CODE_TYPES);
+    }
+
+    protected void updateContactList() {
+        getLoaderManager().restartLoader(0, null, this);
+    }
+
+    // LoaderManager.LoaderCallbacks<SortedSet<Contact>>
+
+    public Loader<SortedSet<Contact>> onCreateLoader(int id, Bundle args) {
+        return new AddressBookLoader(getActivity());
+    }
+
+    private static class AddressBookLoader extends BetterAsyncTaskLoader<SortedSet<Contact>> {
+        public AddressBookLoader(Context context) {
+            super(context);
+        }
+
+        @Override
+        public SortedSet<Contact> loadInBackground() {
+            SortedSet<Contact> contacts = null;
+            try {
+                contacts = I2PBote.getInstance().getAddressBook().getAll();
+            } catch (PasswordException e) {
+                // TODO handle, but should not get here
+                e.printStackTrace();
+            }
+            return contacts;
+        }
+
+        @Override
+        protected void onStartMonitoring() {
+        }
+
+        @Override
+        protected void onStopMonitoring() {
+        }
+
+        @Override
+        protected void releaseResources(SortedSet<Contact> data) {
+        }
+    }
+
+    @Override
+    public void onLoadFinished(Loader<SortedSet<Contact>> loader,
+            SortedSet<Contact> data) {
+        mAdapter.setContacts(data);
+    }
+
+    @Override
+    public void onLoaderReset(Loader<SortedSet<Contact>> loader) {
+        mAdapter.setContacts(null);
+    }
+}

android/src/main/java/i2p/bote/android/addressbook/AddressBookShipActivity.java

@@ -0,0 +1,26 @@
+package i2p.bote.android.addressbook;
+
+import android.widget.Toast;
+
+import i2p.bote.android.R;
+import i2p.bote.android.util.DataShipActivity;
+import i2p.bote.android.util.DataShipFragment;
+
+public class AddressBookShipActivity extends DataShipActivity {
+    @Override
+    protected DataShipFragment getDataShipFragment() {
+        return AddressBookShipFragment.newInstance(mExporting);
+    }
+
+    // DataShipFragment.Callbacks
+
+    public void onTaskFinished() {
+        Toast.makeText(this,
+                mExporting ?
+                        R.string.address_book_exported:
+                        R.string.address_book_imported,
+                Toast.LENGTH_SHORT).show();
+        setResult(RESULT_OK);
+        finish();
+    }
+}

android/src/main/java/i2p/bote/android/addressbook/AddressBookShipFragment.java

@@ -0,0 +1,95 @@
+package i2p.bote.android.addressbook;
+
+import android.os.Bundle;
+import android.view.View;
+
+import java.io.File;
+import java.io.FileDescriptor;
+
+import i2p.bote.I2PBote;
+import i2p.bote.android.R;
+import i2p.bote.android.util.DataShipFragment;
+import i2p.bote.android.util.RobustAsyncTask;
+import i2p.bote.fileencryption.PasswordException;
+
+public abstract class AddressBookShipFragment extends DataShipFragment {
+    public static DataShipFragment newInstance(boolean exporting) {
+        return exporting ?
+                new ExportAddressBookFragment() :
+                new ImportAddressBookFragment();
+    }
+
+    public static class ExportAddressBookFragment extends ExportDataFragment {
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            mExportFilename.setText("addressBook");
+        }
+
+        @Override
+        protected RobustAsyncTask<Object, String, String> getExportWaiter() {
+            return new ExportWaiter();
+        }
+
+        @Override
+        protected int getTitle() {
+            return R.string.export_address_book;
+        }
+
+        private class ExportWaiter extends RobustAsyncTask<Object, String, String> {
+            @Override
+            protected String doInBackground(Object... params) {
+                try {
+                    publishProgress(getResources().getString(R.string.exporting_address_book));
+                    I2PBote.getInstance().getAddressBook().export(
+                            (File) params[0],
+                            (String) params[1]);
+                    return null;
+                } catch (Throwable e) {
+                    cancel(false);
+                    return e.getMessage();
+                }
+            }
+        }
+    }
+
+    public static class ImportAddressBookFragment extends ImportDataFragment {
+        @Override
+        protected RobustAsyncTask<Object, String, String> getImportWaiter() {
+            return new ImportWaiter();
+        }
+
+        @Override
+        protected int getTitle() {
+            return R.string.import_address_book;
+        }
+
+        private class ImportWaiter extends RobustAsyncTask<Object, String, String> {
+            @Override
+            protected String doInBackground(Object... params) {
+                try {
+                    publishProgress(getResources().getString(R.string.importing_address_book));
+                    boolean success = I2PBote.getInstance().getAddressBook().importFromFileDescriptor(
+                            (FileDescriptor) params[0],
+                            (String) params[1],
+                            (Boolean) params[2],
+                            (Boolean) params[3]);
+                    if (success)
+                        return null;
+                    else {
+                        cancel(false);
+                        return (params[1] == null) ?
+                                getResources().getString(R.string.no_contacts_found_maybe_encrypted) :
+                                getResources().getString(R.string.no_contacts_found);
+                    }
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                    cancel(false);
+                    if (e instanceof PasswordException)
+                        return getResources().getString(R.string.password_incorrect);
+                    return e.getLocalizedMessage();
+                }
+            }
+        }
+    }
+}

android/src/main/java/i2p/bote/android/addressbook/ContactAdapter.java

@@ -0,0 +1,131 @@
+package i2p.bote.android.addressbook;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.SortedSet;
+
+import i2p.bote.android.R;
+import i2p.bote.android.util.BoteHelper;
+import i2p.bote.packet.dht.Contact;
+
+public class ContactAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+    private Context mCtx;
+    private List<Contact> mContacts;
+    private AddressBookFragment.OnContactSelectedListener mListener;
+
+    public static class SimpleViewHolder extends RecyclerView.ViewHolder {
+        public SimpleViewHolder(View itemView) {
+            super(itemView);
+        }
+    }
+
+    public static class ContactViewHolder extends RecyclerView.ViewHolder {
+        public ImageView mPicture;
+        public TextView mName;
+
+        public ContactViewHolder(View itemView) {
+            super(itemView);
+            mPicture = (ImageView) itemView.findViewById(R.id.contact_picture);
+            mName = (TextView) itemView.findViewById(R.id.contact_name);
+        }
+    }
+
+    public ContactAdapter(Context context, AddressBookFragment.OnContactSelectedListener listener) {
+        mCtx = context;
+        mListener = listener;
+        setHasStableIds(true);
+    }
+
+    public void setContacts(SortedSet<Contact> contacts) {
+        if (contacts != null) {
+            mContacts = new ArrayList<Contact>();
+            mContacts.addAll(contacts);
+        } else
+            mContacts = null;
+
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (mContacts == null || mContacts.isEmpty())
+            return R.layout.listitem_empty;
+
+        return R.layout.listitem_contact;
+    }
+
+    // Create new views (invoked by the layout manager)
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent,
+                                                      int viewType) {
+        View v = LayoutInflater.from(parent.getContext())
+                .inflate(viewType, parent, false);
+        switch (viewType) {
+            case R.layout.listitem_contact:
+                return new ContactViewHolder(v);
+            default:
+                return new SimpleViewHolder(v);
+        }
+    }
+
+    // Replace the contents of a view (invoked by the layout manager)
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        switch (holder.getItemViewType()) {
+            case R.layout.listitem_empty:
+                ((TextView) holder.itemView).setText(
+                        mCtx.getResources().getString(R.string.address_book_empty));
+                break;
+
+            case R.layout.listitem_contact:
+                final ContactViewHolder cvh = (ContactViewHolder) holder;
+                Contact contact = mContacts.get(position);
+
+                String pic = contact.getPictureBase64();
+                if (pic != null && !pic.isEmpty())
+                    cvh.mPicture.setImageBitmap(BoteHelper.decodePicture(pic));
+                else {
+                    ViewGroup.LayoutParams lp = cvh.mPicture.getLayoutParams();
+                    cvh.mPicture.setImageBitmap(BoteHelper.getIdenticonForAddress(contact.getBase64Dest(), lp.width, lp.height));
+                }
+
+                cvh.mName.setText(contact.getName());
+
+                cvh.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        mListener.onContactSelected(mContacts.get(cvh.getAdapterPosition()));
+                    }
+                });
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    // Return the size of the dataset (invoked by the layout manager)
+    @Override
+    public int getItemCount() {
+        if (mContacts == null || mContacts.isEmpty())
+            return 1;
+
+        return mContacts.size();
+    }
+
+    public long getItemId(int position) {
+        if (mContacts == null || mContacts.isEmpty())
+            return 0;
+
+        Contact contact = mContacts.get(position);
+        return contact.getDestination().getHash().hashCode();
+    }
+}

android/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java

@@ -0,0 +1,93 @@
+package i2p.bote.android.addressbook;
+
+import android.content.Intent;
+import android.nfc.NdefMessage;
+import android.nfc.NdefRecord;
+import android.nfc.NfcAdapter;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.support.v7.widget.Toolbar;
+
+import java.util.Arrays;
+
+import i2p.bote.android.BoteActivityBase;
+import i2p.bote.android.Constants;
+import i2p.bote.android.R;
+
+public class EditContactActivity extends BoteActivityBase {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_toolbar);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
+        // Enable ActionBar app icon to behave as action to go back
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        if (savedInstanceState == null) {
+            EditContactFragment f;
+            Bundle args = getIntent().getExtras();
+            if (args != null) {
+                String destination = args.getString(EditContactFragment.NEW_DESTINATION);
+                if (destination != null) {
+                    String name = args.getString(EditContactFragment.NEW_NAME);
+                    f = EditContactFragment.newInstance(name, destination);
+                } else {
+                    destination = args.getString(EditContactFragment.CONTACT_DESTINATION);
+                    f = EditContactFragment.newInstance(destination);
+                }
+                if (destination != null)
+                    getSupportActionBar().setDisplayShowTitleEnabled(false);
+            } else
+                f = EditContactFragment.newInstance(null);
+            getSupportFragmentManager().beginTransaction()
+                    .add(R.id.container, f).commit();
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Check to see that the Activity started due to an Android Beam
+        if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(getIntent().getAction()) ||
+                NfcAdapter.ACTION_TAG_DISCOVERED.equals(getIntent().getAction())) {
+            processIntent(getIntent());
+        }
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        // onResume gets called after this to handle the intent
+        setIntent(intent);
+    }
+
+    /**
+     * Parses the NDEF Message from the intent
+     */
+    private void processIntent(Intent intent) {
+        Parcelable[] rawMsgs = intent.getParcelableArrayExtra(
+                NfcAdapter.EXTRA_NDEF_MESSAGES);
+        if (rawMsgs == null || rawMsgs.length < 1)
+            return; // TODO notify user?
+        NdefMessage msg = (NdefMessage) rawMsgs[0];
+
+        NdefRecord[] records = msg.getRecords();
+        if (records.length != 2 ||
+                records[0].getTnf() != NdefRecord.TNF_EXTERNAL_TYPE ||
+                !Arrays.equals(records[0].getType(), Constants.NDEF_LEGACY_TYPE_CONTACT.getBytes()) ||
+                records[1].getTnf() != NdefRecord.TNF_EXTERNAL_TYPE ||
+                !Arrays.equals(records[1].getType(), Constants.NDEF_LEGACY_TYPE_CONTACT_DESTINATION.getBytes()))
+            return; // TODO notify user?
+        String name = new String(records[0].getPayload());
+        String destination = new String(records[1].getPayload());
+
+        EditContactFragment f = EditContactFragment.newInstance(
+                name, destination);
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.container, f).commit();
+    }
+}

android/src/main/java/i2p/bote/android/addressbook/EditContactFragment.java

@@ -0,0 +1,237 @@
+package i2p.bote.android.addressbook;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.ParcelFileDescriptor;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.mikepenz.google_material_typeface_library.GoogleMaterial;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.security.GeneralSecurityException;
+
+import i2p.bote.I2PBote;
+import i2p.bote.android.R;
+import i2p.bote.android.util.BoteHelper;
+import i2p.bote.android.util.EditPictureFragment;
+import i2p.bote.fileencryption.PasswordException;
+import i2p.bote.packet.dht.Contact;
+
+public class EditContactFragment extends EditPictureFragment {
+    public static final String CONTACT_DESTINATION = "contact_destination";
+    public static final String NEW_NAME = "new_name";
+    public static final String NEW_DESTINATION = "new_destination";
+
+    static final int REQUEST_DESTINATION_FILE = 3;
+    EditText mNameField;
+    EditText mDestinationField;
+    EditText mTextField;
+    TextView mError;
+    private String mDestination;
+
+    public static EditContactFragment newInstance(String destination) {
+        EditContactFragment f = new EditContactFragment();
+        Bundle args = new Bundle();
+        args.putString(CONTACT_DESTINATION, destination);
+        f.setArguments(args);
+        return f;
+    }
+
+    public static EditContactFragment newInstance(String name, String destination) {
+        EditContactFragment f = new EditContactFragment();
+        Bundle args = new Bundle();
+        args.putString(NEW_NAME, name);
+        args.putString(NEW_DESTINATION, destination);
+        f.setArguments(args);
+        return f;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+        mDestination = getArguments().getString(CONTACT_DESTINATION);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_edit_contact, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        mNameField = (EditText) view.findViewById(R.id.contact_name);
+        mDestinationField = (EditText) view.findViewById(R.id.destination);
+        mTextField = (EditText) view.findViewById(R.id.text);
+        mError = (TextView) view.findViewById(R.id.error);
+
+        Button b = (Button) view.findViewById(R.id.import_destination_from_file);
+        if (mDestination != null) {
+            mDestinationField.setVisibility(View.GONE);
+            b.setVisibility(View.GONE);
+        } else
+            b.setOnClickListener(new View.OnClickListener() {
+                public void onClick(View view) {
+                    Intent i = new Intent(Intent.ACTION_GET_CONTENT);
+                    i.setType("text/plain");
+                    i.addCategory(Intent.CATEGORY_OPENABLE);
+                    try {
+                        startActivityForResult(
+                                Intent.createChooser(i,
+                                        getResources().getString(R.string.select_email_destination_file)),
+                                REQUEST_DESTINATION_FILE);
+                    } catch (android.content.ActivityNotFoundException ex) {
+                        Toast.makeText(getActivity(), R.string.please_install_a_file_manager,
+                                Toast.LENGTH_SHORT).show();
+                    }
+                }
+            });
+
+        if (I2PBote.getInstance().isPasswordRequired()) {
+            // Request a password from the user.
+            BoteHelper.requestPassword(getActivity(), new BoteHelper.RequestPasswordListener() {
+                @Override
+                public void onPasswordVerified() {
+                    initializeContact();
+                }
+
+                @Override
+                public void onPasswordCanceled() {
+                    getActivity().setResult(Activity.RESULT_CANCELED);
+                    getActivity().finish();
+                }
+            });
+        } else {
+            // Password is cached, or not set.
+            initializeContact();
+        }
+    }
+
+    private void initializeContact() {
+        String newDest = getArguments().getString(NEW_DESTINATION);
+
+        if (mDestination != null) {
+            try {
+                Contact contact = BoteHelper.getContact(mDestination);
+
+                String pic = contact.getPictureBase64();
+                if (pic != null && !pic.isEmpty()) {
+                    setPictureB64(pic);
+                }
+
+                mNameField.setText(contact.getName());
+                mTextField.setText(contact.getText());
+            } catch (PasswordException e) {
+                // TODO Handle
+                e.printStackTrace();
+            }
+        } else if (newDest != null) {
+            mNameField.setText(getArguments().getString(NEW_NAME));
+            mDestinationField.setText(newDest);
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.edit_contact, menu);
+        menu.findItem(R.id.action_save_contact).setIcon(BoteHelper.getMenuIcon(getActivity(), GoogleMaterial.Icon.gmd_save));
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_save_contact:
+                String picture = getPictureB64();
+                String name = mNameField.getText().toString();
+                String destination = mDestination == null ?
+                        mDestinationField.getText().toString() : mDestination;
+                String text = mTextField.getText().toString();
+
+                // Check fields
+                if (destination.isEmpty()) {
+                    mDestinationField.setError(getActivity().getString(R.string.this_field_is_required));
+                    mDestinationField.requestFocus();
+                    return true;
+                } else {
+                    mDestinationField.setError(null);
+                }
+
+                mError.setText("");
+
+                try {
+                    String err = BoteHelper.saveContact(destination, name, picture, text);
+                    if (err == null) {
+                        if (mDestination == null) // Only set if adding new contact
+                            getActivity().setResult(Activity.RESULT_OK);
+                        getActivity().finish();
+                    } else {
+                        if (err.startsWith("No Email Destination found in string:") ||
+                                err.startsWith("Not a valid Email Destination:")) {
+                            mDestinationField.setError(getActivity().getString(R.string.not_a_valid_bote_address));
+                            mDestinationField.requestFocus();
+                        } else {
+                            mError.setText(err);
+                        }
+                    }
+                } catch (PasswordException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                    mError.setText(e.getLocalizedMessage());
+                } catch (GeneralSecurityException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                    mError.setText(e.getLocalizedMessage());
+                }
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_DESTINATION_FILE) {
+            if (resultCode == Activity.RESULT_OK) {
+                Uri result = data.getData();
+                BufferedReader br;
+                try {
+                    ParcelFileDescriptor pfd = getActivity().getContentResolver().openFileDescriptor(result, "r");
+                    br = new BufferedReader(
+                            new InputStreamReader(
+                                    new FileInputStream(pfd.getFileDescriptor()))
+                    );
+                    try {
+                        mDestinationField.setText(br.readLine());
+                    } catch (IOException ioe) {
+                        Toast.makeText(getActivity(), R.string.failed_to_read_email_destination_file,
+                                Toast.LENGTH_SHORT).show();
+                    }
+                } catch (FileNotFoundException fnfe) {
+                    Toast.makeText(getActivity(), R.string.could_not_find_email_destination_file,
+                            Toast.LENGTH_SHORT).show();
+                }
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+}

android/src/main/java/i2p/bote/android/addressbook/ViewContactActivity.java

@@ -0,0 +1,78 @@
+package i2p.bote.android.addressbook;
+
+import android.annotation.SuppressLint;
+import android.nfc.NdefMessage;
+import android.nfc.NfcAdapter;
+import android.nfc.NfcEvent;
+import android.os.Build;
+import android.os.Bundle;
+
+import i2p.bote.android.BoteActivityBase;
+
+public class ViewContactActivity extends BoteActivityBase {
+    NfcAdapter mNfcAdapter;
+
+    @SuppressLint("NewApi")
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (savedInstanceState == null) {
+            String destination = null;
+            Bundle args = getIntent().getExtras();
+            if (args != null)
+                destination = args.getString(ViewContactFragment.ADDRESS);
+
+            if (destination == null) {
+                setResult(RESULT_CANCELED);
+                finish();
+                return;
+            }
+
+            ViewContactFragment f = ViewContactFragment.newInstance(destination);
+            getSupportFragmentManager().beginTransaction()
+                    .add(android.R.id.content, f).commit();
+        }
+
+        mNfcAdapter = NfcAdapter.getDefaultAdapter(this);
+        if (mNfcAdapter != null &&
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+            mNfcAdapter.setNdefPushMessageCallback(new NfcAdapter.CreateNdefMessageCallback() {
+                @Override
+                public NdefMessage createNdefMessage(NfcEvent nfcEvent) {
+                    return getNdefMessage();
+                }
+            }, this);
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    @SuppressLint("NewApi")
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (mNfcAdapter != null &&
+                Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+            mNfcAdapter.enableForegroundNdefPush(this, getNdefMessage());
+        }
+    }
+
+    private NdefMessage getNdefMessage() {
+        ViewContactFragment f = (ViewContactFragment) getSupportFragmentManager()
+                .findFragmentById(android.R.id.content);
+        return f.createNdefMessage();
+    }
+
+    @SuppressWarnings("deprecation")
+    @SuppressLint("NewApi")
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        if (mNfcAdapter != null &&
+                Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+            mNfcAdapter.disableForegroundNdefPush(this);
+        }
+    }
+}

android/src/main/java/i2p/bote/android/addressbook/ViewContactFragment.java

@@ -0,0 +1,101 @@
+package i2p.bote.android.addressbook;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import java.security.GeneralSecurityException;
+
+import i2p.bote.android.R;
+import i2p.bote.android.util.BoteHelper;
+import i2p.bote.android.util.ViewAddressFragment;
+import i2p.bote.fileencryption.PasswordException;
+import i2p.bote.packet.dht.Contact;
+
+public class ViewContactFragment extends ViewAddressFragment {
+    private Contact mContact;
+
+    public static ViewContactFragment newInstance(String destination) {
+        ViewContactFragment f = new ViewContactFragment();
+        Bundle args = new Bundle();
+        args.putString(ADDRESS, destination);
+        f.setArguments(args);
+        return f;
+    }
+
+    @Override
+    protected void loadAddress() {
+        try {
+            mContact = BoteHelper.getContact(mAddress);
+            if (mContact == null) {
+                // No contact found, finish
+                getActivity().setResult(Activity.RESULT_CANCELED);
+                getActivity().finish();
+            }
+        } catch (PasswordException e) {
+            // TODO Handle
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    protected String getPublicName() {
+        return mContact.getName();
+    }
+
+    @Override
+    protected int getDeleteAddressMessage() {
+        return R.string.delete_contact;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        Bitmap picture = BoteHelper.decodePicture(mContact.getPictureBase64());
+        if (picture != null)
+            mPicture.setImageBitmap(picture);
+        else {
+            ViewGroup.LayoutParams lp = mPicture.getLayoutParams();
+            mPicture.setImageBitmap(BoteHelper.getIdenticonForAddress(mAddress, lp.width, lp.height));
+        }
+
+        mPublicName.setText(mContact.getName());
+        if (mContact.getText().isEmpty())
+            mDescription.setVisibility(View.GONE);
+        else {
+            mDescription.setText(mContact.getText());
+            mDescription.setVisibility(View.VISIBLE);
+        }
+        mCryptoImplName.setText(mContact.getDestination().getCryptoImpl().getName());
+    }
+
+    @Override
+    protected void onEditAddress() {
+        Intent ei = new Intent(getActivity(), EditContactActivity.class);
+        ei.putExtra(EditContactFragment.CONTACT_DESTINATION, mAddress);
+        startActivity(ei);
+    }
+
+    @Override
+    public void onDeleteAddress() {
+        try {
+            String err = BoteHelper.deleteContact(mAddress);
+            if (err == null) {
+                getActivity().setResult(Activity.RESULT_OK);
+                getActivity().finish();
+            } else
+                Toast.makeText(getActivity(), err, Toast.LENGTH_SHORT).show();
+        } catch (PasswordException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (GeneralSecurityException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+}

android/src/main/java/i2p/bote/android/config/AdvancedPreferenceFragment.java

@@ -0,0 +1,128 @@
+package i2p.bote.android.config;
+
+import android.content.Context;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v7.preference.CheckBoxPreference;
+import android.support.v7.preference.EditTextPreference;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceFragmentCompat;
+
+import i2p.bote.android.R;
+import i2p.bote.android.config.util.SummaryEditTextPreference;
+
+public class AdvancedPreferenceFragment extends PreferenceFragmentCompat {
+    @Override
+    public void onCreatePreferences(Bundle paramBundle, String s) {
+        addPreferencesFromResource(R.xml.settings_advanced);
+        setupAdvancedSettings();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        //noinspection ConstantConditions
+        ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_label_advanced);
+    }
+
+    private void setupAdvancedSettings() {
+        final Context ctx = getPreferenceManager().getContext();
+        final PreferenceCategory i2pCat = (PreferenceCategory) findPreference("i2pCategory");
+        CheckBoxPreference routerAuto = (CheckBoxPreference) findPreference("i2pbote.router.auto");
+
+        if (!routerAuto.isChecked()) {
+            setupI2PCategory(ctx, i2pCat);
+        }
+
+        routerAuto.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                final Boolean checked = (Boolean) newValue;
+                if (!checked) {
+                    setupI2PCategory(ctx, i2pCat);
+                } else {
+                    Preference p1 = i2pCat.findPreference("i2pbote.router.use");
+                    Preference p2 = i2pCat.findPreference("i2pbote.i2cp.tcp.host");
+                    Preference p3 = i2pCat.findPreference("i2pbote.i2cp.tcp.port");
+                    if (p1 != null)
+                        i2pCat.removePreference(p1);
+                    if (p2 != null)
+                        i2pCat.removePreference(p2);
+                    if (p3 != null)
+                        i2pCat.removePreference(p3);
+                }
+                return true;
+            }
+        });
+    }
+
+    private static void setupI2PCategory(Context context, PreferenceCategory i2pCat) {
+        final ListPreference routerChoice = createRouterChoice(context);
+        final EditTextPreference hostField = createHostField(context);
+        final EditTextPreference portField = createPortField(context);
+        i2pCat.addPreference(routerChoice);
+        i2pCat.addPreference(hostField);
+        i2pCat.addPreference(portField);
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB)
+            routerChoice.setSummary(routerChoice.getEntry());
+
+        if ("remote".equals(routerChoice.getValue())) {
+            hostField.setEnabled(true);
+            portField.setEnabled(true);
+        }
+
+        routerChoice.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                final String val = newValue.toString();
+                int index = routerChoice.findIndexOfValue(val);
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB)
+                    routerChoice.setSummary(routerChoice.getEntries()[index]);
+                if (index == 2) {
+                    hostField.setEnabled(true);
+                    hostField.setText("127.0.0.1");
+                    portField.setEnabled(true);
+                    portField.setText("7654");
+                } else {
+                    hostField.setEnabled(false);
+                    hostField.setText("internal");
+                    portField.setEnabled(false);
+                    portField.setText("internal");
+                }
+                return true;
+            }
+        });
+    }
+
+    private static ListPreference createRouterChoice(Context context) {
+        ListPreference routerChoice = new ListPreference(context);
+        routerChoice.setKey("i2pbote.router.use");
+        routerChoice.setEntries(R.array.routerOptionNames);
+        routerChoice.setEntryValues(R.array.routerOptions);
+        routerChoice.setTitle(R.string.pref_title_router);
+        routerChoice.setSummary("%s");
+        routerChoice.setDialogTitle(R.string.pref_dialog_title_router);
+        routerChoice.setDefaultValue("internal");
+        return routerChoice;
+    }
+
+    private static EditTextPreference createHostField(Context context) {
+        EditTextPreference p = new SummaryEditTextPreference(context);
+        p.setKey("i2pbote.i2cp.tcp.host");
+        p.setTitle(R.string.pref_title_i2cp_host);
+        p.setSummary("%s");
+        p.setDefaultValue("internal");
+        p.setEnabled(false);
+        return p;
+    }
+
+    private static EditTextPreference createPortField(Context context) {
+        EditTextPreference p = new SummaryEditTextPreference(context);
+        p.setKey("i2pbote.i2cp.tcp.port");
+        p.setTitle(R.string.pref_title_i2cp_port);
+        p.setSummary("%s");
+        p.setDefaultValue("internal");
+        p.setEnabled(false);
+        return p;
+    }
+}

android/src/main/java/i2p/bote/android/config/AppProtectionPreferenceFragment.java

@@ -0,0 +1,40 @@
+package i2p.bote.android.config;
+
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceFragmentCompat;
+
+import i2p.bote.android.R;
+
+public class AppProtectionPreferenceFragment extends PreferenceFragmentCompat {
+    @Override
+    public void onCreatePreferences(Bundle paramBundle, String s) {
+        addPreferencesFromResource(R.xml.settings_app_protection);
+        setupAppProtectionSettings();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        //noinspection ConstantConditions
+        ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_label_app_protection);
+
+        // Screen security only works from API 14
+        Preference screenSecurityPreference = findPreference("pref_screen_security");
+        if (screenSecurityPreference != null &&
+                Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH)
+            getPreferenceScreen().removePreference(screenSecurityPreference);
+    }
+
+    private void setupAppProtectionSettings() {
+        findPreference("pref_change_password").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                startActivity(new Intent(getActivity(), SetPasswordActivity.class));
+                return true;
+            }
+        });
+    }
+}

android/src/main/java/i2p/bote/android/config/AppearancePreferenceFragment.java

@@ -0,0 +1,35 @@
+package i2p.bote.android.config;
+
+import android.os.Bundle;
+import android.support.v7.preference.PreferenceFragmentCompat;
+
+import i2p.bote.android.R;
+
+public class AppearancePreferenceFragment extends PreferenceFragmentCompat {
+    @Override
+    public void onCreatePreferences(Bundle paramBundle, String s) {
+        addPreferencesFromResource(R.xml.settings_appearance);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(
+                (SettingsActivity) getActivity()
+        );
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_label_appearance);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(
+                (SettingsActivity) getActivity()
+        );
+    }
+}

android/src/main/java/i2p/bote/android/config/NetworkPreferenceFragment.java

@@ -0,0 +1,47 @@
+package i2p.bote.android.config;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+
+import java.util.Map;
+
+import i2p.bote.Configuration;
+import i2p.bote.I2PBote;
+import i2p.bote.android.R;
+import i2p.bote.android.config.util.CustomPreferenceFragment;
+
+public class NetworkPreferenceFragment extends CustomPreferenceFragment {
+    @Override
+    public void onCreatePreferences(Bundle paramBundle, String s) {
+        addPreferencesFromResource(R.xml.settings_network);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        //noinspection ConstantConditions
+        ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_label_network);
+    }
+
+    @Override
+    public void onPause() {
+        Configuration config = I2PBote.getInstance().getConfiguration();
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
+
+        Map<String, ?> all = prefs.getAll();
+        for (String x : all.keySet()) {
+            if ("autoMailCheckEnabled".equals(x))
+                config.setAutoMailCheckEnabled(prefs.getBoolean(x, true));
+            else if ("mailCheckInterval".equals(x))
+                config.setMailCheckInterval(prefs.getInt(x, 30));
+            else if ("deliveryCheckEnabled".equals(x))
+                config.setDeliveryCheckEnabled(prefs.getBoolean(x, true));
+        }
+
+        config.save();
+
+        // Store the settings in Android
+        super.onPause();
+    }
+}

android/src/main/java/i2p/bote/android/config/PrivacyPreferenceFragment.java

@@ -0,0 +1,70 @@
+package i2p.bote.android.config;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+
+import java.util.Map;
+
+import i2p.bote.Configuration;
+import i2p.bote.I2PBote;
+import i2p.bote.android.R;
+import i2p.bote.android.config.util.CustomPreferenceFragment;
+
+public class PrivacyPreferenceFragment extends CustomPreferenceFragment {
+    @Override
+    public void onCreatePreferences(Bundle paramBundle, String s) {
+        addPreferencesFromResource(R.xml.settings_privacy);
+        setupPrivacySettings();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        //noinspection ConstantConditions
+        ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.pref_title_privacy);
+    }
+
+    @Override
+    public void onPause() {
+        Configuration config = I2PBote.getInstance().getConfiguration();
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
+
+        Map<String, ?> all = prefs.getAll();
+        for (String x : all.keySet()) {
+            if ("hideLocale".equals(x))
+                config.setHideLocale(prefs.getBoolean(x, true));
+            else if ("includeSentTime".equals(x))
+                config.setIncludeSentTime(prefs.getBoolean(x, true));
+            else if ("numSendHops".equals(x))
+                config.setNumStoreHops(Integer.parseInt(prefs.getString(x, "0")));
+            else if ("relayMinDelay".equals(x))
+                config.setRelayMinDelay(prefs.getInt(x, 5));
+            else if ("relayMaxDelay".equals(x))
+                config.setRelayMaxDelay(prefs.getInt(x, 40));
+        }
+
+        config.save();
+
+        // Store the settings in Android
+        super.onPause();
+    }
+
+    private void setupPrivacySettings() {
+        ListPreference numSendHops = (ListPreference) findPreference("numSendHops");
+        int value = Integer.valueOf(numSendHops.getValue());
+        numSendHops.setSummary(getResources().getQuantityString(R.plurals.pref_summ_numHops,
+                value, value));
+        numSendHops.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                int value = Integer.valueOf((String) newValue);
+                preference.setSummary(getResources().getQuantityString(R.plurals.pref_summ_numHops,
+                        value, value));
+                return true;
+            }
+        });
+    }
+}

android/src/main/java/i2p/bote/android/config/SetPasswordActivity.java

@@ -0,0 +1,34 @@
+package i2p.bote.android.config;
+
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.widget.Toast;
+
+import i2p.bote.android.BoteActivityBase;
+import i2p.bote.android.R;
+
+public class SetPasswordActivity extends BoteActivityBase implements
+        SetPasswordFragment.Callbacks {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_set_password);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
+        // Enable ActionBar app icon to behave as action to go back
+        //noinspection ConstantConditions
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    }
+
+    // SetPasswordFragment.Callbacks
+
+    public void onTaskFinished() {
+        Toast.makeText(this, R.string.password_changed,
+                Toast.LENGTH_SHORT).show();
+        setResult(RESULT_OK);
+        finish();
+    }
+}

android/src/main/java/i2p/bote/android/config/SetPasswordFragment.java

@@ -0,0 +1,266 @@
+package i2p.bote.android.config;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.mikepenz.google_material_typeface_library.GoogleMaterial;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import i2p.bote.I2PBote;
+import i2p.bote.fileencryption.PasswordIncorrectException;
+import i2p.bote.fileencryption.PasswordMismatchException;
+import i2p.bote.status.StatusListener;
+import i2p.bote.android.R;
+import i2p.bote.android.util.BoteHelper;
+import i2p.bote.android.util.RobustAsyncTask;
+import i2p.bote.android.util.TaskFragment;
+import i2p.bote.status.ChangePasswordStatus;
+
+public class SetPasswordFragment extends Fragment {
+    private Callbacks mCallbacks = sDummyCallbacks;
+
+    public interface Callbacks {
+        public void onTaskFinished();
+    }
+    private static Callbacks sDummyCallbacks = new Callbacks() {
+        public void onTaskFinished() {}
+    };
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        if (!(activity instanceof Callbacks))
+            throw new IllegalStateException("Activity must implement fragment's callbacks.");
+        mCallbacks = (Callbacks) activity;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mCallbacks = sDummyCallbacks;
+    }
+
+    // Code to identify the fragment that is calling onActivityResult().
+    static final int PASSWORD_WAITER = 0;
+    // Tag so we can find the task fragment again, in another
+    // instance of this fragment after rotation.
+    static final String PASSWORD_WAITER_TAG = "passwordWaiterTask";
+
+    MenuItem mSave;
+    EditText mOldField;
+    EditText mNewField;
+    EditText mConfirmField;
+    TextView mError;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+
+        PasswordWaiterFrag f = (PasswordWaiterFrag) getFragmentManager().findFragmentByTag(PASSWORD_WAITER_TAG);
+        if (f != null)
+            f.setTargetFragment(this, PASSWORD_WAITER);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_set_password, container);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        mOldField = (EditText) view.findViewById(R.id.password_old);
+        mNewField = (EditText) view.findViewById(R.id.password_new);
+        mConfirmField = (EditText) view.findViewById(R.id.password_confirm);
+        mError = (TextView) view.findViewById(R.id.error);
+
+        if (!I2PBote.getInstance().getConfiguration().getPasswordFile().exists()) {
+            mOldField.setVisibility(View.GONE);
+            view.findViewById(R.id.msg_remove_password).setVisibility(View.GONE);
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.set_password, menu);
+        mSave = menu.findItem(R.id.action_set_password);
+
+        mSave.setIcon(BoteHelper.getMenuIcon(getActivity(), GoogleMaterial.Icon.gmd_save));
+
+        // If task is running, disable the save button.
+        PasswordWaiterFrag f = (PasswordWaiterFrag) getFragmentManager().findFragmentByTag(PASSWORD_WAITER_TAG);
+        if (f != null)
+            setInterfaceEnabled(false);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case R.id.action_set_password:
+            String oldPassword = mOldField.getText().toString();
+            String newPassword = mNewField.getText().toString();
+            String confirmNewPassword = mConfirmField.getText().toString();
+
+            InputMethodManager imm = (InputMethodManager)getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(mNewField.getWindowToken(), 0);
+
+            setInterfaceEnabled(false);
+            mError.setText("");
+
+            PasswordWaiterFrag f = PasswordWaiterFrag.newInstance(oldPassword, newPassword, confirmNewPassword);
+            f.setTask(new PasswordWaiter());
+            f.setTargetFragment(SetPasswordFragment.this, PASSWORD_WAITER);
+            getFragmentManager().beginTransaction()
+                .replace(R.id.password_waiter_frag, f, PASSWORD_WAITER_TAG)
+                .commit();
+            return true;
+
+        default:
+            return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == PASSWORD_WAITER) {
+            if (resultCode == Activity.RESULT_OK) {
+                mCallbacks.onTaskFinished();
+            } else if (resultCode == Activity.RESULT_CANCELED) {
+                setInterfaceEnabled(true);
+                mError.setText(data.getStringExtra("error"));
+            }
+        }
+    }
+
+    private void setInterfaceEnabled(boolean enabled) {
+        mSave.setVisible(enabled);
+        mOldField.setEnabled(enabled);
+        mNewField.setEnabled(enabled);
+        mConfirmField.setEnabled(enabled);
+    }
+
+    public static class PasswordWaiterFrag extends TaskFragment<String, String, Throwable> {
+        String currentStatus;
+        TextView mStatus;
+
+        public static PasswordWaiterFrag newInstance(String... params) {
+            PasswordWaiterFrag f = new PasswordWaiterFrag();
+            Bundle args = new Bundle();
+            args.putStringArray("params", params);
+            f.setArguments(args);
+            return f;
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            View v = inflater.inflate(R.layout.dialog_status, container, false);
+            mStatus = (TextView) v.findViewById(R.id.status);
+
+            if (currentStatus != null && !currentStatus.isEmpty())
+                mStatus.setText(currentStatus);
+
+            return v;
+        }
+
+        @Override
+        public String[] getParams() {
+            Bundle args = getArguments();
+            return args.getStringArray("params");
+        }
+
+        @Override
+        public void updateProgress(String... values) {
+            ChangePasswordStatus status = ChangePasswordStatus.valueOf(values[0]);
+            switch (status) {
+                case CHECKING_PASSWORD:
+                    currentStatus = getString(R.string.checking_password);
+                    break;
+                case RE_ENCRYPTING_IDENTITIES:
+                    currentStatus = getString(R.string.re_encrypting_identities);
+                    break;
+                case RE_ENCRYPTING_ADDRESS_BOOK:
+                    currentStatus = getString(R.string.re_encrypting_address_book);
+                    break;
+                case RE_ENCRYPTING_FOLDER:
+                    currentStatus = getString(R.string.re_encrypting_folder, values[1]);
+                    break;
+                case UPDATING_PASSWORD_FILE:
+                    currentStatus = getString(R.string.updating_password_file);
+                    break;
+            }
+            mStatus.setText(currentStatus);
+        }
+
+        @Override
+        public void taskFinished(Throwable ignored) {
+            super.taskFinished(ignored);
+
+            if (getTargetFragment() != null) {
+                Intent i = new Intent();
+                getTargetFragment().onActivityResult(
+                        getTargetRequestCode(), Activity.RESULT_OK, i);
+            }
+        }
+
+        @Override
+        public void taskCancelled(Throwable error) {
+            super.taskCancelled(error);
+
+            if (getTargetFragment() != null) {
+                Intent i = new Intent();
+                if (error instanceof PasswordIncorrectException) {
+                    i.putExtra("error", getString(R.string.old_password_incorrect));
+                } else if (error instanceof PasswordMismatchException) {
+                    i.putExtra("error", getString(R.string.new_password_mismatch));
+                } else {
+                    i.putExtra("error", error.getLocalizedMessage());
+                }
+                System.out.println("Password error: " + error.toString());
+                getTargetFragment().onActivityResult(
+                        getTargetRequestCode(), Activity.RESULT_CANCELED, i);
+            }
+        }
+    }
+
+    private class PasswordWaiter extends RobustAsyncTask<String, String, Throwable> {
+        protected Throwable doInBackground(String... params) {
+            StatusListener<ChangePasswordStatus> lsnr = new StatusListener<ChangePasswordStatus>() {
+                public void updateStatus(ChangePasswordStatus status, String... args) {
+                    ArrayList<String> tmp = new ArrayList<>(Arrays.asList(args));
+                    tmp.add(0, status.name());
+                    publishProgress(tmp.toArray(new String[tmp.size()]));
+                }
+            };
+            try {
+                I2PBote.getInstance().changePassword(
+                        params[0].getBytes(),
+                        params[1].getBytes(),
+                        params[2].getBytes(),
+                        lsnr);
+                return null;
+            } catch (Throwable e) {
+                cancel(false);
+                return e;
+            }
+        }
+    }
+}

android/src/main/java/i2p/bote/android/config/SettingsActivity.java

@@ -0,0 +1,178 @@
+package i2p.bote.android.config;
+
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.content.LocalBroadcastManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceFragmentCompat;
+import android.support.v7.widget.Toolbar;
+
+import i2p.bote.I2PBote;
+import i2p.bote.android.BoteActivityBase;
+import i2p.bote.android.EmailListActivity;
+import i2p.bote.android.R;
+import i2p.bote.android.identities.IdentityListActivity;
+import i2p.bote.android.service.BoteService;
+import i2p.bote.android.util.BoteHelper;
+
+public class SettingsActivity extends BoteActivityBase implements
+        SharedPreferences.OnSharedPreferenceChangeListener {
+    public static final String PREFERENCE_CATEGORY = "preference_category";
+    public static final String PREFERENCE_CATEGORY_NETWORK = "preference_category_network";
+    public static final String PREFERENCE_CATEGORY_IDENTITIES = "preference_category_identities";
+    public static final String PREFERENCE_CATEGORY_PRIVACY = "preference_category_privacy";
+    public static final String PREFERENCE_CATEGORY_APP_PROTECTION = "preference_category_app_protection";
+    public static final String PREFERENCE_CATEGORY_APPEARANCE = "preference_category_appearance";
+    public static final String PREFERENCE_CATEGORY_ADVANCED = "preference_category_advanced";
+
+
+    //
+    // Android lifecycle
+    //
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_toolbar);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+        //noinspection ConstantConditions
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        Fragment fragment;
+        String category = getIntent().getStringExtra(PREFERENCE_CATEGORY);
+        if (category != null)
+            fragment = getFragmentForCategory(category);
+        else
+            fragment = new SettingsFragment();
+
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.container, fragment)
+                .commit();
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        if (fragmentManager.getBackStackEntryCount() > 0) {
+            fragmentManager.popBackStack();
+        } else {
+            Intent intent = new Intent(this, EmailListActivity.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            startActivity(intent);
+            finish();
+        }
+        return true;
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals("pref_language")) {
+            notifyLocaleChanged();
+            Intent intent = new Intent(BoteService.LOCAL_BROADCAST_LOCALE_CHANGED);
+            LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
+        }
+    }
+
+
+    //
+    // Settings pages
+    //
+
+    public static class SettingsFragment extends PreferenceFragmentCompat {
+        @Override
+        public void onCreatePreferences(Bundle paramBundle, String s) {
+            addPreferencesFromResource(R.xml.settings);
+
+            findPreference(PREFERENCE_CATEGORY_NETWORK)
+                    .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_NETWORK));
+            findPreference(PREFERENCE_CATEGORY_IDENTITIES)
+                    .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_IDENTITIES));
+            findPreference(PREFERENCE_CATEGORY_PRIVACY)
+                    .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_PRIVACY));
+            findPreference(PREFERENCE_CATEGORY_APP_PROTECTION)
+                    .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_APP_PROTECTION));
+            findPreference(PREFERENCE_CATEGORY_APPEARANCE)
+                    .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_APPEARANCE));
+            findPreference(PREFERENCE_CATEGORY_ADVANCED)
+                    .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_ADVANCED));
+        }
+
+        @Override
+        public void onResume() {
+            super.onResume();
+            //noinspection ConstantConditions
+            ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.action_settings);
+        }
+
+        private class CategoryClickListener implements Preference.OnPreferenceClickListener {
+            private String category;
+
+            public CategoryClickListener(String category) {
+                this.category = category;
+            }
+
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                switch (category) {
+                    case PREFERENCE_CATEGORY_IDENTITIES:
+                        Intent ili = new Intent(getActivity(), IdentityListActivity.class);
+                        startActivity(ili);
+                        break;
+
+                    case PREFERENCE_CATEGORY_PRIVACY:
+                    case PREFERENCE_CATEGORY_APP_PROTECTION:
+                        if (I2PBote.getInstance().isPasswordRequired()) {
+                            BoteHelper.requestPassword(getActivity(), new BoteHelper.RequestPasswordListener() {
+                                @Override
+                                public void onPasswordVerified() {
+                                    loadCategory();
+                                }
+
+                                @Override
+                                public void onPasswordCanceled() {
+                                }
+                            });
+                        } else
+                            loadCategory();
+                        break;
+
+                    default:
+                        loadCategory();
+                }
+
+                return true;
+            }
+
+            private void loadCategory() {
+                Fragment fragment = getFragmentForCategory(category);
+                getActivity().getSupportFragmentManager().beginTransaction()
+                        .replace(R.id.container, fragment)
+                        .addToBackStack(null)
+                        .commit();
+            }
+        }
+    }
+
+    private static Fragment getFragmentForCategory(String category) {
+        switch (category) {
+            case PREFERENCE_CATEGORY_NETWORK:
+                return new NetworkPreferenceFragment();
+            case PREFERENCE_CATEGORY_PRIVACY:
+                return new PrivacyPreferenceFragment();
+            case PREFERENCE_CATEGORY_APP_PROTECTION:
+                return new AppProtectionPreferenceFragment();
+            case PREFERENCE_CATEGORY_APPEARANCE:
+                return new AppearancePreferenceFragment();
+            case PREFERENCE_CATEGORY_ADVANCED:
+                return new AdvancedPreferenceFragment();
+            default:
+                throw new AssertionError();
+        }
+    }
+}

android/src/main/java/i2p/bote/android/config/util/CustomPreferenceFragment.java

@@ -0,0 +1,32 @@
+package i2p.bote.android.config.util;
+
+import android.support.v4.app.DialogFragment;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceFragmentCompat;
+
+/**
+ * Handles custom Preferences.
+ */
+public abstract class CustomPreferenceFragment extends PreferenceFragmentCompat {
+    private static final String DIALOG_FRAGMENT_TAG =
+            "android.support.v7.preference.PreferenceFragment.DIALOG";
+
+    @Override
+    public void onDisplayPreferenceDialog(Preference preference) {
+        // check if dialog is already showing
+        if (getFragmentManager().findFragmentByTag(DIALOG_FRAGMENT_TAG) != null) {
+            return;
+        }
+
+        DialogFragment f = null;
+        if (preference instanceof IntEditTextPreference) {
+            f = IntEditTextPreferenceDialog.newInstance(preference.getKey());
+        } else {
+            super.onDisplayPreferenceDialog(preference);
+        }
+        if (f != null) {
+            f.setTargetFragment(this, 0);
+            f.show(getFragmentManager(), DIALOG_FRAGMENT_TAG);
+        }
+    }
+}

android/src/main/java/i2p/bote/android/config/util/IconicsPreference.java

@@ -0,0 +1,51 @@
+package i2p.bote.android.config.util;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Build;
+import android.support.v7.preference.Preference;
+import android.util.AttributeSet;
+
+import com.mikepenz.iconics.IconicsDrawable;
+
+import i2p.bote.android.R;
+
+public class IconicsPreference extends Preference {
+    public IconicsPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public IconicsPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(context, attrs);
+    }
+
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    private void init(Context context, AttributeSet attrs) {
+        // Icons only work on API 11+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB)
+            return;
+
+        TypedArray a = context.obtainStyledAttributes(attrs,
+                R.styleable.IconicsPreference, 0, 0);
+        String iconName = a.getString(R.styleable.IconicsPreference_ip_icon);
+        if (iconName == null)
+            return;
+
+        IconicsDrawable icon = new IconicsDrawable(context, iconName);
+        int color = a.getColor(R.styleable.IconicsPreference_ip_color, 0);
+        if (color != 0)
+            icon.color(color);
+        int size = a.getDimensionPixelSize(R.styleable.IconicsPreference_ip_size, 0);
+        if (size != 0)
+            icon.sizePx(size);
+        int padding = a.getDimensionPixelSize(R.styleable.IconicsPreference_ip_padding, 0);
+        if (padding != 0)
+            icon.paddingPx(padding);
+
+        a.recycle();
+        setIcon(icon);
+    }
+}

android/src/main/java/i2p/bote/android/config/util/IntEditTextPreference.java

@@ -0,0 +1,35 @@
+package i2p.bote.android.config.util;
+
+import android.content.Context;
+import android.support.v7.preference.EditTextPreference;
+import android.util.AttributeSet;
+
+public class IntEditTextPreference extends EditTextPreference {
+
+    public IntEditTextPreference(Context context) {
+        super(context);
+    }
+
+    public IntEditTextPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public IntEditTextPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return String.format((String) super.getSummary(), getText());
+    }
+
+    @Override
+    protected String getPersistedString(String defaultReturnValue) {
+        return String.valueOf(getPersistedInt(-1));
+    }
+
+    @Override
+    protected boolean persistString(String value) {
+        return persistInt(Integer.valueOf(value));
+    }
+}

android/src/main/java/i2p/bote/android/config/util/IntEditTextPreferenceDialog.java

@@ -0,0 +1,24 @@
+package i2p.bote.android.config.util;
+
+import android.os.Bundle;
+import android.support.v7.preference.EditTextPreferenceDialogFragmentCompat;
+import android.text.InputType;
+import android.view.View;
+import android.widget.EditText;
+
+public class IntEditTextPreferenceDialog extends EditTextPreferenceDialogFragmentCompat {
+    public static IntEditTextPreferenceDialog newInstance(String key) {
+        final IntEditTextPreferenceDialog fragment = new IntEditTextPreferenceDialog();
+        final Bundle b = new Bundle(1);
+        b.putString(ARG_KEY, key);
+        fragment.setArguments(b);
+        return fragment;
+    }
+
+    @Override
+    protected void onBindDialogView(View view) {
+        super.onBindDialogView(view);
+        ((EditText)view.findViewById(android.R.id.edit)).setInputType(
+                InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED);
+    }
+}

android/src/main/java/i2p/bote/android/config/util/SummaryEditTextPreference.java

@@ -0,0 +1,28 @@
+package i2p.bote.android.config.util;
+
+import android.content.Context;
+import android.support.v7.preference.EditTextPreference;
+import android.util.AttributeSet;
+
+public class SummaryEditTextPreference extends EditTextPreference {
+
+    public SummaryEditTextPreference(Context context) {
+        super(context);
+    }
+
+    public SummaryEditTextPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SummaryEditTextPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        String summary = (String) super.getSummary();
+        if (summary == null)
+            summary = "%s";
+        return String.format(summary, getText());
+    }
+}

android/src/main/java/i2p/bote/android/identities/EditIdentityActivity.java

@@ -0,0 +1,45 @@
+package i2p.bote.android.identities;
+
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.widget.Toast;
+
+import i2p.bote.android.BoteActivityBase;
+import i2p.bote.android.R;
+
+public class EditIdentityActivity extends BoteActivityBase implements
+        EditIdentityFragment.Callbacks {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_edit_identity);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
+        // Enable ActionBar app icon to behave as action to go back
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        if (savedInstanceState == null) {
+            String key = null;
+            Bundle args = getIntent().getExtras();
+            if (args != null)
+                key = args.getString(EditIdentityFragment.IDENTITY_KEY);
+            if (key != null)
+                getSupportActionBar().setDisplayShowTitleEnabled(false);
+            EditIdentityFragment f = EditIdentityFragment.newInstance(key);
+            getSupportFragmentManager().beginTransaction()
+                .add(R.id.edit_identity_frag, f).commit();
+        }
+    }
+
+    // EditIdentityFragment.Callbacks
+
+    public void onTaskFinished() {
+        Toast.makeText(this, R.string.identity_saved,
+                Toast.LENGTH_SHORT).show();
+        setResult(RESULT_OK);
+        finish();
+    }
+}

android/src/main/java/i2p/bote/android/identities/EditIdentityFragment.java

@@ -0,0 +1,428 @@
+package i2p.bote.android.identities;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.mikepenz.google_material_typeface_library.GoogleMaterial;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+
+import i2p.bote.I2PBote;
+import i2p.bote.email.IllegalDestinationParametersException;
+import i2p.bote.status.StatusListener;
+import i2p.bote.android.R;
+import i2p.bote.android.util.BoteHelper;
+import i2p.bote.android.util.EditPictureFragment;
+import i2p.bote.android.util.RobustAsyncTask;
+import i2p.bote.android.util.TaskFragment;
+import i2p.bote.crypto.CryptoFactory;
+import i2p.bote.crypto.CryptoImplementation;
+import i2p.bote.email.EmailIdentity;
+import i2p.bote.fileencryption.PasswordException;
+import i2p.bote.status.ChangeIdentityStatus;
+
+public class EditIdentityFragment extends EditPictureFragment {
+    private Callbacks mCallbacks = sDummyCallbacks;
+
+    public interface Callbacks {
+        public void onTaskFinished();
+    }
+    private static Callbacks sDummyCallbacks = new Callbacks() {
+        public void onTaskFinished() {}
+    };
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        if (!(activity instanceof Callbacks))
+            throw new IllegalStateException("Activity must implement fragment's callbacks.");
+        mCallbacks = (Callbacks) activity;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mCallbacks = sDummyCallbacks;
+    }
+
+    public static final String IDENTITY_KEY = "identity_key";
+
+    // Code to identify the fragment that is calling onActivityResult().
+    static final int IDENTITY_WAITER = 3;
+    // Tag so we can find the task fragment again, in another
+    // instance of this fragment after rotation.
+    static final String IDENTITY_WAITER_TAG = "identityWaiterTask";
+
+    static final int DEFAULT_CRYPTO_IMPL = 2;
+
+    private String mKey;
+    MenuItem mSave;
+    EditText mNameField;
+    EditText mDescField;
+    Spinner mCryptoField;
+    int mDefaultPos;
+    CheckBox mDefaultField;
+    TextView mError;
+
+    public static EditIdentityFragment newInstance(String key) {
+        EditIdentityFragment f = new EditIdentityFragment();
+        Bundle args = new Bundle();
+        args.putString(IDENTITY_KEY, key);
+        f.setArguments(args);
+        return f;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+
+        IdentityWaiterFrag f = (IdentityWaiterFrag) getFragmentManager().findFragmentByTag(IDENTITY_WAITER_TAG);
+        if (f != null)
+            f.setTargetFragment(this, IDENTITY_WAITER);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_edit_identity, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        mKey = getArguments().getString(IDENTITY_KEY);
+
+        mNameField = (EditText) view.findViewById(R.id.public_name);
+        mDescField = (EditText) view.findViewById(R.id.description);
+        mDefaultField = (CheckBox) view.findViewById(R.id.default_identity);
+        mError = (TextView) view.findViewById(R.id.error);
+        mCryptoField = (Spinner) view.findViewById(R.id.crypto_impl);
+
+        if (I2PBote.getInstance().isPasswordRequired()) {
+            // Request a password from the user.
+            BoteHelper.requestPassword(getActivity(), new BoteHelper.RequestPasswordListener() {
+                @Override
+                public void onPasswordVerified() {
+                    initializeIdentity();
+                }
+
+                @Override
+                public void onPasswordCanceled() {
+                    getActivity().setResult(Activity.RESULT_CANCELED);
+                    getActivity().finish();
+                }
+            });
+        } else {
+            // Password is cached, or not set.
+            initializeIdentity();
+        }
+    }
+
+    private void initializeIdentity() {
+        if (mKey == null) {
+            // Show the encryption choice field
+            CryptoAdapter adapter = new CryptoAdapter(getActivity());
+            mCryptoField.setAdapter(adapter);
+            mCryptoField.setSelection(mDefaultPos);
+            mCryptoField.setVisibility(View.VISIBLE);
+            // If no identities, set this as default by default
+            try {
+                mDefaultField.setChecked(I2PBote.getInstance().getIdentities().size() == 0);
+            } catch (PasswordException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            } catch (GeneralSecurityException e) {
+                e.printStackTrace();
+            }
+        } else {
+            // Load the identity to edit
+            try {
+                EmailIdentity identity = BoteHelper.getIdentity(mKey);
+
+                String pic = identity.getPictureBase64();
+                if (pic != null && !pic.isEmpty()) {
+                    setPictureB64(pic);
+                }
+
+                mNameField.setText(identity.getPublicName());
+                mDescField.setText(identity.getDescription());
+                mDefaultField.setChecked(identity.isDefaultIdentity());
+            } catch (PasswordException e) {
+                // TODO Handle
+                e.printStackTrace();
+            } catch (IOException e) {
+                // TODO Handle
+                e.printStackTrace();
+            } catch (GeneralSecurityException e) {
+                // TODO Handle
+                e.printStackTrace();
+            }
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.edit_identity, menu);
+        mSave = menu.findItem(R.id.action_save_identity);
+
+        mSave.setIcon(BoteHelper.getMenuIcon(getActivity(), GoogleMaterial.Icon.gmd_save));
+
+        IdentityWaiterFrag f = (IdentityWaiterFrag) getFragmentManager().findFragmentByTag(IDENTITY_WAITER_TAG);
+        if (f != null)
+            setInterfaceEnabled(false);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case R.id.action_save_identity:
+            String picture = getPictureB64();
+            String publicName = mNameField.getText().toString();
+            String description = mDescField.getText().toString();
+            boolean setDefault = mDefaultField.isChecked();
+
+            int cryptoImplId = -1;
+            if (mKey == null)
+                cryptoImplId = ((CryptoImplementation) mCryptoField.getSelectedItem()).getId();
+
+            InputMethodManager imm = (InputMethodManager)getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(mNameField.getWindowToken(), 0);
+
+            setInterfaceEnabled(false);
+            mError.setText("");
+
+            IdentityWaiterFrag f = IdentityWaiterFrag.newInstance(
+                    (mKey == null),
+                    cryptoImplId,
+                    null,
+                    mKey,
+                    publicName,
+                    description,
+                    picture,
+                    null,
+                    setDefault);
+            f.setTask(new IdentityWaiter());
+            f.setTargetFragment(EditIdentityFragment.this, IDENTITY_WAITER);
+            getFragmentManager().beginTransaction()
+            .replace(R.id.identity_waiter_frag, f, IDENTITY_WAITER_TAG)
+            .commit();
+            return true;
+
+        default:
+            return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == IDENTITY_WAITER) {
+            if (resultCode == Activity.RESULT_OK) {
+                mCallbacks.onTaskFinished();
+            } else if (resultCode == Activity.RESULT_CANCELED) {
+                setInterfaceEnabled(true);
+                mError.setText(data.getStringExtra("error"));
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
+    private void setInterfaceEnabled(boolean enabled) {
+        mSave.setVisible(enabled);
+        mNameField.setEnabled(enabled);
+        mDescField.setEnabled(enabled);
+        mDefaultField.setEnabled(enabled);
+    }
+
+    private class CryptoAdapter extends ArrayAdapter<CryptoImplementation> {
+        public CryptoAdapter(Context context) {
+            super(context, android.R.layout.simple_spinner_item);
+            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+
+            List<CryptoImplementation> instances = CryptoFactory.getInstances();
+            mDefaultPos = 0;
+            for (CryptoImplementation instance : instances) {
+                add(instance);
+                if (instance.getId() == DEFAULT_CRYPTO_IMPL)
+                    mDefaultPos = getPosition(instance);
+            }
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            View v = super.getView(position, convertView, parent);
+            setViewText(v, position);
+            return v;
+        }
+
+        @Override
+        public View getDropDownView (int position, View convertView, ViewGroup parent) {
+            View v = super.getDropDownView(position, convertView, parent);
+            setViewText(v, position);
+            return v;
+        }
+
+        private void setViewText(View v, int position) {
+            TextView text = (TextView) v.findViewById(android.R.id.text1);
+            text.setText(getItem(position).getName());
+        }
+    }
+
+    public static class IdentityWaiterFrag extends TaskFragment<Object, String, Throwable> {
+        static final String CREATE_NEW = "create_new";
+        static final String CRYPTO_IMPL_ID = "crypto_impl_id";
+        static final String VANITY_PREFIX = "vanity_prefix";
+        static final String KEY = "key";
+        static final String PUBLIC_NAME = "public_name";
+        static final String DESCRIPTION = "description";
+        static final String PICTURE_BASE64 = "picture_base64";
+        static final String EMAIL_ADDRESS = "email_address";
+        static final String SET_DEFAULT = "set_default";
+
+        String currentStatus;
+        TextView mStatus;
+
+        public static IdentityWaiterFrag newInstance(
+                boolean createNew, int cryptoImplId, String vanity_prefix,
+                String key, String publicName, String description,
+                String pictureBase64, String emailAddress, boolean setDefault) {
+            IdentityWaiterFrag f = new IdentityWaiterFrag();
+            Bundle args = new Bundle();
+            args.putBoolean(CREATE_NEW, createNew);
+            args.putInt(CRYPTO_IMPL_ID, cryptoImplId);
+            args.putString(VANITY_PREFIX, vanity_prefix);
+            args.putString(KEY, key);
+            args.putString(PUBLIC_NAME, publicName);
+            args.putString(DESCRIPTION, description);
+            args.putString(PICTURE_BASE64, pictureBase64);
+            args.putString(EMAIL_ADDRESS, emailAddress);
+            args.putBoolean(SET_DEFAULT, setDefault);
+            f.setArguments(args);
+            return f;
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            View v = inflater.inflate(R.layout.dialog_status, container, false);
+            mStatus = (TextView) v.findViewById(R.id.status);
+
+            if (currentStatus != null && !currentStatus.isEmpty())
+                mStatus.setText(currentStatus);
+
+            return v;
+        }
+
+        @Override
+        public Object[] getParams() {
+            Bundle args = getArguments();
+            return new Object[] {
+                    args.getBoolean(CREATE_NEW),
+                    args.getInt(CRYPTO_IMPL_ID),
+                    args.getString(VANITY_PREFIX),
+                    args.getString(KEY),
+                    args.getString(PUBLIC_NAME),
+                    args.getString(DESCRIPTION),
+                    args.getString(PICTURE_BASE64),
+                    args.getString(EMAIL_ADDRESS),
+                    args.getBoolean(SET_DEFAULT),
+            };
+        }
+
+        @Override
+        public void updateProgress(String... values) {
+            ChangeIdentityStatus status = ChangeIdentityStatus.valueOf(values[0]);
+            switch (status) {
+                case GENERATING_KEYS:
+                    currentStatus = getString(R.string.generating_keys);
+                    break;
+                case SAVING_IDENTITY:
+                    currentStatus = getString(R.string.saving_identity);
+                    break;
+            }
+            mStatus.setText(currentStatus);
+        }
+
+        @Override
+        public void taskFinished(Throwable ignored) {
+            super.taskFinished(ignored);
+
+            if (getTargetFragment() != null) {
+                Intent i = new Intent();
+                getTargetFragment().onActivityResult(
+                        getTargetRequestCode(), Activity.RESULT_OK, i);
+            }
+        }
+
+        @Override
+        public void taskCancelled(Throwable error) {
+            super.taskCancelled(error);
+
+            if (getTargetFragment() != null) {
+                Intent i = new Intent();
+                if (error instanceof IllegalDestinationParametersException) {
+                    IllegalDestinationParametersException e = (IllegalDestinationParametersException) error;
+                    i.putExtra("error", getString(R.string.invalid_vanity_chars, e.getBadChar(), e.getValidChars()));
+                } else {
+                    i.putExtra("error", error.getLocalizedMessage());
+                }
+                getTargetFragment().onActivityResult(
+                        getTargetRequestCode(), Activity.RESULT_CANCELED, i);
+            }
+        }
+    }
+
+    private class IdentityWaiter extends RobustAsyncTask<Object, String, Throwable> {
+        protected Throwable doInBackground(Object... params) {
+            StatusListener<ChangeIdentityStatus> lsnr = new StatusListener<ChangeIdentityStatus>() {
+                public void updateStatus(ChangeIdentityStatus status, String... args) {
+                    ArrayList<String> tmp = new ArrayList<>(Arrays.asList(args));
+                    tmp.add(0, status.name());
+                    publishProgress(tmp.toArray(new String[tmp.size()]));
+                }
+            };
+            try {
+                BoteHelper.createOrModifyIdentity(
+                        (Boolean) params[0],
+                        (Integer) params[1],
+                        (String) params[2],
+                        (String) params[3],
+                        (String) params[4],
+                        (String) params[5],
+                        (String) params[6],
+                        (String) params[7],
+                        new Properties(),
+                        (Boolean) params[8],
+                        lsnr);
+                lsnr.updateStatus(ChangeIdentityStatus.SAVING_IDENTITY);
+                I2PBote.getInstance().getIdentities().save();
+                return null;
+            } catch (Throwable e) {
+                cancel(false);
+                return e;
+            }
+        }
+    }
+}

android/src/main/java/i2p/bote/android/identities/IdentityAdapter.java

@@ -0,0 +1,126 @@
+package i2p.bote.android.identities;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import i2p.bote.android.R;
+import i2p.bote.android.util.BoteHelper;
+import i2p.bote.email.EmailIdentity;
+
+public class IdentityAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+    private Context mCtx;
+    private List<EmailIdentity> mIdentities;
+    private IdentityListFragment.OnIdentitySelectedListener mListener;
+
+    public static class SimpleViewHolder extends RecyclerView.ViewHolder {
+        public SimpleViewHolder(View itemView) {
+            super(itemView);
+        }
+    }
+
+    public static class IdentityViewHolder extends RecyclerView.ViewHolder {
+        public ImageView mPicture;
+        public TextView mName;
+
+        public IdentityViewHolder(View itemView) {
+            super(itemView);
+            mPicture = (ImageView) itemView.findViewById(R.id.identity_picture);
+            mName = (TextView) itemView.findViewById(R.id.identity_name);
+        }
+    }
+
+    public IdentityAdapter(Context context, IdentityListFragment.OnIdentitySelectedListener listener) {
+        mCtx = context;
+        mListener = listener;
+        setHasStableIds(true);
+    }
+
+    public void setIdentities(Collection<EmailIdentity> identities) {
+        if (identities != null) {
+            mIdentities = new ArrayList<>();
+            mIdentities.addAll(identities);
+        } else
+            mIdentities = null;
+
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (mIdentities == null || mIdentities.isEmpty())
+            return R.layout.listitem_empty;
+
+        return R.layout.listitem_identity;
+    }
+
+    // Create new views (invoked by the layout manager)
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent,
+                                                      int viewType) {
+        View v = LayoutInflater.from(parent.getContext())
+                .inflate(viewType, parent, false);
+        switch (viewType) {
+            case R.layout.listitem_identity:
+                return new IdentityViewHolder(v);
+            default:
+                return new SimpleViewHolder(v);
+        }
+    }
+
+    // Replace the contents of a view (invoked by the layout manager)
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        switch (holder.getItemViewType()) {
+            case R.layout.listitem_empty:
+                ((TextView) holder.itemView).setText(
+                        mCtx.getResources().getString(R.string.no_identities));
+                break;
+
+            case R.layout.listitem_identity:
+                final IdentityViewHolder cvh = (IdentityViewHolder) holder;
+                EmailIdentity identity = mIdentities.get(position);
+
+                ViewGroup.LayoutParams lp = cvh.mPicture.getLayoutParams();
+                cvh.mPicture.setImageBitmap(BoteHelper.getIdentityPicture(identity, lp.width, lp.height));
+
+                cvh.mName.setText(identity.getPublicName());
+
+                cvh.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        mListener.onIdentitySelected(mIdentities.get(cvh.getAdapterPosition()));
+                    }
+                });
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    // Return the size of the dataset (invoked by the layout manager)
+    @Override
+    public int getItemCount() {
+        if (mIdentities == null || mIdentities.isEmpty())
+            return 1;
+
+        return mIdentities.size();
+    }
+
+    public long getItemId(int position) {
+        if (mIdentities == null || mIdentities.isEmpty())
+            return 0;
+
+        EmailIdentity identity = mIdentities.get(position);
+        return identity.getHash().hashCode();
+    }
+}

android/src/main/java/i2p/bote/android/identities/IdentityListActivity.java

@@ -0,0 +1,53 @@
+package i2p.bote.android.identities;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+
+import i2p.bote.android.BoteActivityBase;
+import i2p.bote.android.R;
+import i2p.bote.email.EmailIdentity;
+
+public class IdentityListActivity extends BoteActivityBase implements
+        IdentityListFragment.OnIdentitySelectedListener {
+    static final int ALTER_IDENTITY_LIST = 1;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_toolbar);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
+        // Enable ActionBar app icon to behave as action to go back
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        if (savedInstanceState == null) {
+            IdentityListFragment f = new IdentityListFragment();
+            getSupportFragmentManager().beginTransaction()
+                .add(R.id.container, f).commit();
+        }
+    }
+
+    @Override
+    public void onIdentitySelected(EmailIdentity identity) {
+        Intent i = new Intent(this, ViewIdentityActivity.class);
+        i.putExtra(ViewIdentityFragment.ADDRESS, identity.getKey());
+        startActivityForResult(i, ALTER_IDENTITY_LIST);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == ALTER_IDENTITY_LIST) {
+            if (resultCode == Activity.RESULT_OK) {
+                IdentityListFragment f = (IdentityListFragment) getSupportFragmentManager().findFragmentById(R.id.container);
+                f.updateIdentityList();
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+}