diff --git a/README.md b/README.md
index b520771..34f8a00 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # msgapi-sdk-php
-Version: 1.1.0
+Version: 1.1.3
 
 ## Installation
 - Install PHP 5.4 or later: [https://secure.php.net/manual/en/install.php](https://secure.php.net/manual/en/install.php)
diff --git a/docs/classes/Curve25519.html b/docs/classes/Curve25519.html
index 32b5613..f6fdd8f 100644
--- a/docs/classes/Curve25519.html
+++ b/docs/classes/Curve25519.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2035208703"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1317129256"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-2035208703" class="accordion-body collapse in">
+            <div id="namespace-1317129256" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-795196327"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-838472620"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-795196327" class="accordion-body collapse ">
+            <div id="namespace-838472620" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1098216327"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-851006812"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1098216327" class="accordion-body collapse ">
+            <div id="namespace-851006812" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1395664011"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2108395120"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1395664011" class="accordion-body collapse ">
+            <div id="namespace-2108395120" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1251740444"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-310807954"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1251740444" class="accordion-body collapse ">
+            <div id="namespace-310807954" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1612391589"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1859712424"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1612391589" class="accordion-body collapse ">
+            <div id="namespace-1859712424" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1542710035"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1136243783"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1542710035" class="accordion-body collapse ">
+            <div id="namespace-1136243783" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-670404196"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-703470185"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-670404196" class="accordion-body collapse ">
+            <div id="namespace-703470185" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-435094843"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1266294631"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-435094843" class="accordion-body collapse ">
+            <div id="namespace-1266294631" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-503392863"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1500446321"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-503392863" class="accordion-body collapse ">
+            <div id="namespace-1500446321" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-167710112"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1164560766"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-167710112" class="accordion-body collapse ">
+            <div id="namespace-1164560766" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-28625846"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-820683384"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-28625846" class="accordion-body collapse ">
+            <div id="namespace-820683384" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1371836800"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-780220535"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1371836800" class="accordion-body collapse ">
+            <div id="namespace-780220535" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2069566615"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1794657584"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2069566615" class="accordion-body collapse ">
+            <div id="namespace-1794657584" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1508,7 +1508,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/FieldElement.html b/docs/classes/FieldElement.html
index 66bd2b0..0738ea0 100644
--- a/docs/classes/FieldElement.html
+++ b/docs/classes/FieldElement.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-211028819"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1540922722"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-211028819" class="accordion-body collapse in">
+            <div id="namespace-1540922722" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-377383231"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1274035401"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-377383231" class="accordion-body collapse ">
+            <div id="namespace-1274035401" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1777431018"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-762633119"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1777431018" class="accordion-body collapse ">
+            <div id="namespace-762633119" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2102019097"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-857898442"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-2102019097" class="accordion-body collapse ">
+            <div id="namespace-857898442" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1176481065"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1153546517"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1176481065" class="accordion-body collapse ">
+            <div id="namespace-1153546517" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-261918059"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-302232492"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-261918059" class="accordion-body collapse ">
+            <div id="namespace-302232492" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-831744961"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2139987978"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-831744961" class="accordion-body collapse ">
+            <div id="namespace-2139987978" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1814919461"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1246218316"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1814919461" class="accordion-body collapse ">
+            <div id="namespace-1246218316" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-97894880"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-835482569"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-97894880" class="accordion-body collapse ">
+            <div id="namespace-835482569" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-82764931"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-123871806"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-82764931" class="accordion-body collapse ">
+            <div id="namespace-123871806" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-752002002"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-966861649"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-752002002" class="accordion-body collapse ">
+            <div id="namespace-966861649" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-818497423"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1691277158"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-818497423" class="accordion-body collapse ">
+            <div id="namespace-1691277158" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1375241727"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1924329115"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1375241727" class="accordion-body collapse ">
+            <div id="namespace-1924329115" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-871923023"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1661356255"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-871923023" class="accordion-body collapse ">
+            <div id="namespace-1661356255" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -996,7 +996,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Poly1305.html b/docs/classes/Poly1305.html
index a569a26..0d5b48a 100644
--- a/docs/classes/Poly1305.html
+++ b/docs/classes/Poly1305.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1862079110"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-102719318"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1862079110" class="accordion-body collapse in">
+            <div id="namespace-102719318" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1424736080"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1015744644"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1424736080" class="accordion-body collapse ">
+            <div id="namespace-1015744644" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1369430007"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-594793897"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1369430007" class="accordion-body collapse ">
+            <div id="namespace-594793897" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1122868884"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1163119962"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1122868884" class="accordion-body collapse ">
+            <div id="namespace-1163119962" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2092121995"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2136243892"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-2092121995" class="accordion-body collapse ">
+            <div id="namespace-2136243892" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-379925561"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-279777234"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-379925561" class="accordion-body collapse ">
+            <div id="namespace-279777234" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1126580746"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-926844644"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1126580746" class="accordion-body collapse ">
+            <div id="namespace-926844644" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-539466999"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1287787563"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-539466999" class="accordion-body collapse ">
+            <div id="namespace-1287787563" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-19786638"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-321766872"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-19786638" class="accordion-body collapse ">
+            <div id="namespace-321766872" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1401831392"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1037174545"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1401831392" class="accordion-body collapse ">
+            <div id="namespace-1037174545" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-621373730"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-485429441"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-621373730" class="accordion-body collapse ">
+            <div id="namespace-485429441" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-694856512"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-37511408"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-694856512" class="accordion-body collapse ">
+            <div id="namespace-37511408" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-279835821"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2010834833"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-279835821" class="accordion-body collapse ">
+            <div id="namespace-2010834833" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-489212404"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1946229389"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-489212404" class="accordion-body collapse ">
+            <div id="namespace-1946229389" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1021,7 +1021,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Salsa20.html b/docs/classes/Salsa20.html
index c0eec47..6d7a587 100644
--- a/docs/classes/Salsa20.html
+++ b/docs/classes/Salsa20.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1062564844"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1159580343"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1062564844" class="accordion-body collapse in">
+            <div id="namespace-1159580343" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-709810755"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-754111259"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-709810755" class="accordion-body collapse ">
+            <div id="namespace-754111259" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-851109770"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-499882650"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-851109770" class="accordion-body collapse ">
+            <div id="namespace-499882650" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1273996410"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-129737561"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1273996410" class="accordion-body collapse ">
+            <div id="namespace-129737561" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-813491709"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-445267088"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-813491709" class="accordion-body collapse ">
+            <div id="namespace-445267088" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1418476483"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1185191418"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1418476483" class="accordion-body collapse ">
+            <div id="namespace-1185191418" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-427783653"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-216030179"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-427783653" class="accordion-body collapse ">
+            <div id="namespace-216030179" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1892973647"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1595112153"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1892973647" class="accordion-body collapse ">
+            <div id="namespace-1595112153" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-204642710"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2029213094"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-204642710" class="accordion-body collapse ">
+            <div id="namespace-2029213094" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-359309876"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2108719344"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-359309876" class="accordion-body collapse ">
+            <div id="namespace-2108719344" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1157474713"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1714897055"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1157474713" class="accordion-body collapse ">
+            <div id="namespace-1714897055" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-154086807"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1661288737"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-154086807" class="accordion-body collapse ">
+            <div id="namespace-1661288737" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-117962031"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-445890774"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-117962031" class="accordion-body collapse ">
+            <div id="namespace-445890774" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-846708706"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1655313246"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-846708706" class="accordion-body collapse ">
+            <div id="namespace-1655313246" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -936,7 +936,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Salt.html b/docs/classes/Salt.html
index b7e3191..5603b78 100644
--- a/docs/classes/Salt.html
+++ b/docs/classes/Salt.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-349777219"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1338953450"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-349777219" class="accordion-body collapse in">
+            <div id="namespace-1338953450" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1484754275"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1090035229"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1484754275" class="accordion-body collapse ">
+            <div id="namespace-1090035229" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2058023243"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-218490748"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-2058023243" class="accordion-body collapse ">
+            <div id="namespace-218490748" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1774629532"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1495091380"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1774629532" class="accordion-body collapse ">
+            <div id="namespace-1495091380" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-746501063"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1007690754"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-746501063" class="accordion-body collapse ">
+            <div id="namespace-1007690754" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1441130788"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-169306929"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1441130788" class="accordion-body collapse ">
+            <div id="namespace-169306929" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2028150905"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1671469130"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-2028150905" class="accordion-body collapse ">
+            <div id="namespace-1671469130" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1292025545"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-268492511"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1292025545" class="accordion-body collapse ">
+            <div id="namespace-268492511" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-704417128"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1385230670"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-704417128" class="accordion-body collapse ">
+            <div id="namespace-1385230670" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-280326035"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1238316512"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-280326035" class="accordion-body collapse ">
+            <div id="namespace-1238316512" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1291418865"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1879492428"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1291418865" class="accordion-body collapse ">
+            <div id="namespace-1879492428" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1524234900"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-647711817"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1524234900" class="accordion-body collapse ">
+            <div id="namespace-647711817" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-768691614"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-637601085"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-768691614" class="accordion-body collapse ">
+            <div id="namespace-637601085" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2097934860"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-890122074"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2097934860" class="accordion-body collapse ">
+            <div id="namespace-890122074" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -3179,7 +3179,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/SaltException.html b/docs/classes/SaltException.html
index 57e0a41..d4c784e 100644
--- a/docs/classes/SaltException.html
+++ b/docs/classes/SaltException.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1020737731"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1523308963"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1020737731" class="accordion-body collapse in">
+            <div id="namespace-1523308963" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-202308935"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-551407254"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-202308935" class="accordion-body collapse ">
+            <div id="namespace-551407254" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-82732475"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-317124168"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-82732475" class="accordion-body collapse ">
+            <div id="namespace-317124168" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-895155752"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-483230738"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-895155752" class="accordion-body collapse ">
+            <div id="namespace-483230738" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-26240605"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-587581132"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-26240605" class="accordion-body collapse ">
+            <div id="namespace-587581132" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-479101887"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1200008080"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-479101887" class="accordion-body collapse ">
+            <div id="namespace-1200008080" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1787092212"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-668121971"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1787092212" class="accordion-body collapse ">
+            <div id="namespace-668121971" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1208833517"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-258099583"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1208833517" class="accordion-body collapse ">
+            <div id="namespace-258099583" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2078475450"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-966376730"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-2078475450" class="accordion-body collapse ">
+            <div id="namespace-966376730" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1622495719"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1599729502"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1622495719" class="accordion-body collapse ">
+            <div id="namespace-1599729502" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-324175388"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1326875088"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-324175388" class="accordion-body collapse ">
+            <div id="namespace-1326875088" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-89204566"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1345620971"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-89204566" class="accordion-body collapse ">
+            <div id="namespace-1345620971" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-336917391"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-464325455"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-336917391" class="accordion-body collapse ">
+            <div id="namespace-464325455" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-82597211"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1113028356"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-82597211" class="accordion-body collapse ">
+            <div id="namespace-1113028356" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -599,7 +599,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.Base.html b/docs/classes/Threema.Console.Command.Base.html
index 86bf7d3..134a7c5 100644
--- a/docs/classes/Threema.Console.Command.Base.html
+++ b/docs/classes/Threema.Console.Command.Base.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-94401937"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1499329258"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-94401937" class="accordion-body collapse in">
+            <div id="namespace-1499329258" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-835737815"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1188411425"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-835737815" class="accordion-body collapse ">
+            <div id="namespace-1188411425" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2107846966"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1667917720"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-2107846966" class="accordion-body collapse ">
+            <div id="namespace-1667917720" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1862925955"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1545243076"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1862925955" class="accordion-body collapse ">
+            <div id="namespace-1545243076" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1007407724"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-914383814"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1007407724" class="accordion-body collapse ">
+            <div id="namespace-914383814" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-512053561"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-960215656"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-512053561" class="accordion-body collapse ">
+            <div id="namespace-960215656" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1007838049"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1029435630"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1007838049" class="accordion-body collapse ">
+            <div id="namespace-1029435630" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1283316010"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1525604037"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1283316010" class="accordion-body collapse ">
+            <div id="namespace-1525604037" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1262671127"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1802715706"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1262671127" class="accordion-body collapse ">
+            <div id="namespace-1802715706" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-772747974"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-395719258"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-772747974" class="accordion-body collapse ">
+            <div id="namespace-395719258" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1831324550"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1354015365"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1831324550" class="accordion-body collapse ">
+            <div id="namespace-1354015365" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-631842814"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-994974957"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-631842814" class="accordion-body collapse ">
+            <div id="namespace-994974957" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-819893621"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-39138838"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-819893621" class="accordion-body collapse ">
+            <div id="namespace-39138838" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-413860153"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-206829452"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-413860153" class="accordion-body collapse ">
+            <div id="namespace-206829452" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1494,7 +1494,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.Capability.html b/docs/classes/Threema.Console.Command.Capability.html
index 6613fa7..6d5e48a 100644
--- a/docs/classes/Threema.Console.Command.Capability.html
+++ b/docs/classes/Threema.Console.Command.Capability.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-832373287"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-843136594"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-832373287" class="accordion-body collapse in">
+            <div id="namespace-843136594" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2067755699"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-26902273"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-2067755699" class="accordion-body collapse ">
+            <div id="namespace-26902273" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-997147100"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-26783614"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-997147100" class="accordion-body collapse ">
+            <div id="namespace-26783614" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-906974678"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-225760387"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-906974678" class="accordion-body collapse ">
+            <div id="namespace-225760387" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-748672650"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1985055394"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-748672650" class="accordion-body collapse ">
+            <div id="namespace-1985055394" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1937884244"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1031743698"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1937884244" class="accordion-body collapse ">
+            <div id="namespace-1031743698" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1626611693"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-286768285"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1626611693" class="accordion-body collapse ">
+            <div id="namespace-286768285" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1919436912"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1994921668"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1919436912" class="accordion-body collapse ">
+            <div id="namespace-1994921668" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-491602724"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-727994105"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-491602724" class="accordion-body collapse ">
+            <div id="namespace-727994105" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1704612497"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-748420591"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1704612497" class="accordion-body collapse ">
+            <div id="namespace-748420591" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-691569043"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-991853662"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-691569043" class="accordion-body collapse ">
+            <div id="namespace-991853662" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-796192386"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1387581876"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-796192386" class="accordion-body collapse ">
+            <div id="namespace-1387581876" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-376242449"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1727423630"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-376242449" class="accordion-body collapse ">
+            <div id="namespace-1727423630" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1478435334"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1395183425"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1478435334" class="accordion-body collapse ">
+            <div id="namespace-1395183425" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1558,7 +1558,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.Credits.html b/docs/classes/Threema.Console.Command.Credits.html
index cb17391..fc65f02 100644
--- a/docs/classes/Threema.Console.Command.Credits.html
+++ b/docs/classes/Threema.Console.Command.Credits.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-170760018"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-539516597"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-170760018" class="accordion-body collapse in">
+            <div id="namespace-539516597" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1724656668"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1701164087"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1724656668" class="accordion-body collapse ">
+            <div id="namespace-1701164087" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-585642168"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-846472886"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-585642168" class="accordion-body collapse ">
+            <div id="namespace-846472886" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-815827226"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1279109708"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-815827226" class="accordion-body collapse ">
+            <div id="namespace-1279109708" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-760368824"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1989056240"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-760368824" class="accordion-body collapse ">
+            <div id="namespace-1989056240" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-785979834"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-661415586"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-785979834" class="accordion-body collapse ">
+            <div id="namespace-661415586" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1284514423"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1058102161"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1284514423" class="accordion-body collapse ">
+            <div id="namespace-1058102161" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1126432602"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-386614126"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1126432602" class="accordion-body collapse ">
+            <div id="namespace-386614126" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2116355660"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-569157586"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-2116355660" class="accordion-body collapse ">
+            <div id="namespace-569157586" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-424996707"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1747962769"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-424996707" class="accordion-body collapse ">
+            <div id="namespace-1747962769" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1028329242"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1030748641"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1028329242" class="accordion-body collapse ">
+            <div id="namespace-1030748641" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1827883397"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2092403384"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1827883397" class="accordion-body collapse ">
+            <div id="namespace-2092403384" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1040032989"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1490003666"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1040032989" class="accordion-body collapse ">
+            <div id="namespace-1490003666" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1197496944"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2007019732"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1197496944" class="accordion-body collapse ">
+            <div id="namespace-2007019732" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1558,7 +1558,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.Decrypt.html b/docs/classes/Threema.Console.Command.Decrypt.html
index 85a7f25..45c69bb 100644
--- a/docs/classes/Threema.Console.Command.Decrypt.html
+++ b/docs/classes/Threema.Console.Command.Decrypt.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2098634248"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1812797951"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-2098634248" class="accordion-body collapse in">
+            <div id="namespace-1812797951" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1433954061"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-971823434"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1433954061" class="accordion-body collapse ">
+            <div id="namespace-971823434" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1926512598"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2124678733"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1926512598" class="accordion-body collapse ">
+            <div id="namespace-2124678733" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-819950352"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-960481411"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-819950352" class="accordion-body collapse ">
+            <div id="namespace-960481411" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-451711301"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-140264992"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-451711301" class="accordion-body collapse ">
+            <div id="namespace-140264992" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1378056763"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1554291624"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1378056763" class="accordion-body collapse ">
+            <div id="namespace-1554291624" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-355902771"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1574926880"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-355902771" class="accordion-body collapse ">
+            <div id="namespace-1574926880" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1569438228"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-920340575"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1569438228" class="accordion-body collapse ">
+            <div id="namespace-920340575" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1394679384"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1267854409"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1394679384" class="accordion-body collapse ">
+            <div id="namespace-1267854409" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-739341123"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1580880393"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-739341123" class="accordion-body collapse ">
+            <div id="namespace-1580880393" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-805581861"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2013899347"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-805581861" class="accordion-body collapse ">
+            <div id="namespace-2013899347" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1834773129"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1127715751"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1834773129" class="accordion-body collapse ">
+            <div id="namespace-1127715751" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-357401319"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-267009505"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-357401319" class="accordion-body collapse ">
+            <div id="namespace-267009505" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1787377671"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-291884126"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1787377671" class="accordion-body collapse ">
+            <div id="namespace-291884126" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1525,7 +1525,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.DerivePublicKey.html b/docs/classes/Threema.Console.Command.DerivePublicKey.html
index e8cdc5e..80eb70e 100644
--- a/docs/classes/Threema.Console.Command.DerivePublicKey.html
+++ b/docs/classes/Threema.Console.Command.DerivePublicKey.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-924506880"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1464227333"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-924506880" class="accordion-body collapse in">
+            <div id="namespace-1464227333" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-714913109"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-674028735"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-714913109" class="accordion-body collapse ">
+            <div id="namespace-674028735" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2031618602"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-931073464"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-2031618602" class="accordion-body collapse ">
+            <div id="namespace-931073464" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-467214487"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1072985454"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-467214487" class="accordion-body collapse ">
+            <div id="namespace-1072985454" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1466962604"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1115883206"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1466962604" class="accordion-body collapse ">
+            <div id="namespace-1115883206" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1396295281"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1592820482"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1396295281" class="accordion-body collapse ">
+            <div id="namespace-1592820482" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1945244552"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-880689601"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1945244552" class="accordion-body collapse ">
+            <div id="namespace-880689601" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-893468911"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1775723270"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-893468911" class="accordion-body collapse ">
+            <div id="namespace-1775723270" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-908079701"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1919945737"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-908079701" class="accordion-body collapse ">
+            <div id="namespace-1919945737" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1754748921"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1023861074"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1754748921" class="accordion-body collapse ">
+            <div id="namespace-1023861074" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-971816895"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-82960924"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-971816895" class="accordion-body collapse ">
+            <div id="namespace-82960924" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2144339477"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-942112560"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-2144339477" class="accordion-body collapse ">
+            <div id="namespace-942112560" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2051132777"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-202537167"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2051132777" class="accordion-body collapse ">
+            <div id="namespace-202537167" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-710720372"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1751308748"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-710720372" class="accordion-body collapse ">
+            <div id="namespace-1751308748" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1525,7 +1525,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.Encrypt.html b/docs/classes/Threema.Console.Command.Encrypt.html
index 516596f..bd75ff2 100644
--- a/docs/classes/Threema.Console.Command.Encrypt.html
+++ b/docs/classes/Threema.Console.Command.Encrypt.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-899236080"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-867652343"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-899236080" class="accordion-body collapse in">
+            <div id="namespace-867652343" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1150645247"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-302705155"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1150645247" class="accordion-body collapse ">
+            <div id="namespace-302705155" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2108283375"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-364033375"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-2108283375" class="accordion-body collapse ">
+            <div id="namespace-364033375" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1566942105"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1432125004"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1566942105" class="accordion-body collapse ">
+            <div id="namespace-1432125004" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1577342537"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1559825102"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1577342537" class="accordion-body collapse ">
+            <div id="namespace-1559825102" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-371671277"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-490290186"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-371671277" class="accordion-body collapse ">
+            <div id="namespace-490290186" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1544761087"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1269207649"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1544761087" class="accordion-body collapse ">
+            <div id="namespace-1269207649" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-819863537"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-353644523"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-819863537" class="accordion-body collapse ">
+            <div id="namespace-353644523" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1295090189"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1167130603"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1295090189" class="accordion-body collapse ">
+            <div id="namespace-1167130603" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-800585949"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1998430046"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-800585949" class="accordion-body collapse ">
+            <div id="namespace-1998430046" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1854998916"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1926826424"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1854998916" class="accordion-body collapse ">
+            <div id="namespace-1926826424" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-208582795"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-121540770"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-208582795" class="accordion-body collapse ">
+            <div id="namespace-121540770" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-160915778"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2128151637"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-160915778" class="accordion-body collapse ">
+            <div id="namespace-2128151637" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-144022504"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1747324955"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-144022504" class="accordion-body collapse ">
+            <div id="namespace-1747324955" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1525,7 +1525,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.GenerateKeyPair.html b/docs/classes/Threema.Console.Command.GenerateKeyPair.html
index b7db028..8e9df43 100644
--- a/docs/classes/Threema.Console.Command.GenerateKeyPair.html
+++ b/docs/classes/Threema.Console.Command.GenerateKeyPair.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1927629143"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-434962448"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1927629143" class="accordion-body collapse in">
+            <div id="namespace-434962448" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-484394593"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1656114485"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-484394593" class="accordion-body collapse ">
+            <div id="namespace-1656114485" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1477009875"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1209627521"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1477009875" class="accordion-body collapse ">
+            <div id="namespace-1209627521" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1782046058"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1548708692"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1782046058" class="accordion-body collapse ">
+            <div id="namespace-1548708692" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1512781159"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-842564726"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1512781159" class="accordion-body collapse ">
+            <div id="namespace-842564726" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-348005921"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2034518286"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-348005921" class="accordion-body collapse ">
+            <div id="namespace-2034518286" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-595614843"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-537710617"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-595614843" class="accordion-body collapse ">
+            <div id="namespace-537710617" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1995417810"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-834503351"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1995417810" class="accordion-body collapse ">
+            <div id="namespace-834503351" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-191077314"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-294945827"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-191077314" class="accordion-body collapse ">
+            <div id="namespace-294945827" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-807229445"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2138087709"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-807229445" class="accordion-body collapse ">
+            <div id="namespace-2138087709" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2034329754"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-114755786"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-2034329754" class="accordion-body collapse ">
+            <div id="namespace-114755786" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1117187380"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-250622554"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1117187380" class="accordion-body collapse ">
+            <div id="namespace-250622554" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1776095154"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1593475862"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1776095154" class="accordion-body collapse ">
+            <div id="namespace-1593475862" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2109702327"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-618203329"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2109702327" class="accordion-body collapse ">
+            <div id="namespace-618203329" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1525,7 +1525,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.HashEmail.html b/docs/classes/Threema.Console.Command.HashEmail.html
index 15cc9d5..b2ea124 100644
--- a/docs/classes/Threema.Console.Command.HashEmail.html
+++ b/docs/classes/Threema.Console.Command.HashEmail.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1406602673"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-103355515"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1406602673" class="accordion-body collapse in">
+            <div id="namespace-103355515" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-938971682"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-551643137"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-938971682" class="accordion-body collapse ">
+            <div id="namespace-551643137" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1152722712"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-82242295"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1152722712" class="accordion-body collapse ">
+            <div id="namespace-82242295" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1171535071"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1922289094"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1171535071" class="accordion-body collapse ">
+            <div id="namespace-1922289094" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-829202592"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-540510589"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-829202592" class="accordion-body collapse ">
+            <div id="namespace-540510589" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1615367549"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1623537308"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1615367549" class="accordion-body collapse ">
+            <div id="namespace-1623537308" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-326730174"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1044281646"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-326730174" class="accordion-body collapse ">
+            <div id="namespace-1044281646" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1321421657"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2007852021"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1321421657" class="accordion-body collapse ">
+            <div id="namespace-2007852021" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1037011356"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1655248330"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1037011356" class="accordion-body collapse ">
+            <div id="namespace-1655248330" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-975614230"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-826530518"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-975614230" class="accordion-body collapse ">
+            <div id="namespace-826530518" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-342997943"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1371434386"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-342997943" class="accordion-body collapse ">
+            <div id="namespace-1371434386" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-819311498"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-977183916"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-819311498" class="accordion-body collapse ">
+            <div id="namespace-977183916" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1246131206"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1171017179"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1246131206" class="accordion-body collapse ">
+            <div id="namespace-1171017179" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1716251370"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1598022643"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1716251370" class="accordion-body collapse ">
+            <div id="namespace-1598022643" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1547,7 +1547,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.HashPhone.html b/docs/classes/Threema.Console.Command.HashPhone.html
index 7998a79..4eda777 100644
--- a/docs/classes/Threema.Console.Command.HashPhone.html
+++ b/docs/classes/Threema.Console.Command.HashPhone.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-756892968"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-868920860"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-756892968" class="accordion-body collapse in">
+            <div id="namespace-868920860" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1764249636"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-486526271"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1764249636" class="accordion-body collapse ">
+            <div id="namespace-486526271" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1703141360"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1772876550"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1703141360" class="accordion-body collapse ">
+            <div id="namespace-1772876550" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-239243133"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1326802134"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-239243133" class="accordion-body collapse ">
+            <div id="namespace-1326802134" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1938345670"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1372085423"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1938345670" class="accordion-body collapse ">
+            <div id="namespace-1372085423" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1581312826"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-752178903"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1581312826" class="accordion-body collapse ">
+            <div id="namespace-752178903" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1257920197"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2105196459"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1257920197" class="accordion-body collapse ">
+            <div id="namespace-2105196459" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-824838777"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-93578059"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-824838777" class="accordion-body collapse ">
+            <div id="namespace-93578059" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1611461912"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1386457891"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1611461912" class="accordion-body collapse ">
+            <div id="namespace-1386457891" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1416550399"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1654822326"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1416550399" class="accordion-body collapse ">
+            <div id="namespace-1654822326" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-689364981"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-915409315"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-689364981" class="accordion-body collapse ">
+            <div id="namespace-915409315" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2015108066"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-152186518"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-2015108066" class="accordion-body collapse ">
+            <div id="namespace-152186518" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1228159423"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-395656878"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1228159423" class="accordion-body collapse ">
+            <div id="namespace-395656878" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-386441957"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1102295260"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-386441957" class="accordion-body collapse ">
+            <div id="namespace-1102295260" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1547,7 +1547,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.LookupIdByEmail.html b/docs/classes/Threema.Console.Command.LookupIdByEmail.html
index 81b49b9..1f15456 100644
--- a/docs/classes/Threema.Console.Command.LookupIdByEmail.html
+++ b/docs/classes/Threema.Console.Command.LookupIdByEmail.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1630013516"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-786122955"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1630013516" class="accordion-body collapse in">
+            <div id="namespace-786122955" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-40221926"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1667850607"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-40221926" class="accordion-body collapse ">
+            <div id="namespace-1667850607" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-590930344"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1495265313"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-590930344" class="accordion-body collapse ">
+            <div id="namespace-1495265313" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1802371263"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1642818813"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1802371263" class="accordion-body collapse ">
+            <div id="namespace-1642818813" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-329893575"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1896571065"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-329893575" class="accordion-body collapse ">
+            <div id="namespace-1896571065" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2044233718"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-32299350"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-2044233718" class="accordion-body collapse ">
+            <div id="namespace-32299350" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-960278260"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-949472013"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-960278260" class="accordion-body collapse ">
+            <div id="namespace-949472013" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-772387905"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-145791069"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-772387905" class="accordion-body collapse ">
+            <div id="namespace-145791069" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-198118020"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-158918034"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-198118020" class="accordion-body collapse ">
+            <div id="namespace-158918034" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-871791073"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-346261021"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-871791073" class="accordion-body collapse ">
+            <div id="namespace-346261021" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2002040583"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2069845251"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-2002040583" class="accordion-body collapse ">
+            <div id="namespace-2069845251" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1898453367"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1428860492"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1898453367" class="accordion-body collapse ">
+            <div id="namespace-1428860492" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2089875195"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-221076208"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2089875195" class="accordion-body collapse ">
+            <div id="namespace-221076208" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-959987104"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-799688579"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-959987104" class="accordion-body collapse ">
+            <div id="namespace-799688579" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1580,7 +1580,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.LookupIdByPhoneNo.html b/docs/classes/Threema.Console.Command.LookupIdByPhoneNo.html
index 1131831..c6e9bb9 100644
--- a/docs/classes/Threema.Console.Command.LookupIdByPhoneNo.html
+++ b/docs/classes/Threema.Console.Command.LookupIdByPhoneNo.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1923137568"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-566743981"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1923137568" class="accordion-body collapse in">
+            <div id="namespace-566743981" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1316203560"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1401760390"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1316203560" class="accordion-body collapse ">
+            <div id="namespace-1401760390" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-375542612"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1442685736"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-375542612" class="accordion-body collapse ">
+            <div id="namespace-1442685736" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-85697142"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1997934196"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-85697142" class="accordion-body collapse ">
+            <div id="namespace-1997934196" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-72807625"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1119086499"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-72807625" class="accordion-body collapse ">
+            <div id="namespace-1119086499" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-298013694"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-134189860"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-298013694" class="accordion-body collapse ">
+            <div id="namespace-134189860" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-516357149"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2024083294"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-516357149" class="accordion-body collapse ">
+            <div id="namespace-2024083294" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2136417452"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2089057216"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-2136417452" class="accordion-body collapse ">
+            <div id="namespace-2089057216" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-977965808"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1438425966"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-977965808" class="accordion-body collapse ">
+            <div id="namespace-1438425966" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2037586339"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1282829320"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-2037586339" class="accordion-body collapse ">
+            <div id="namespace-1282829320" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1617090077"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1363909262"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1617090077" class="accordion-body collapse ">
+            <div id="namespace-1363909262" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-798000674"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-326566923"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-798000674" class="accordion-body collapse ">
+            <div id="namespace-326566923" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1781987187"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1347082196"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1781987187" class="accordion-body collapse ">
+            <div id="namespace-1347082196" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1147159371"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-802009513"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1147159371" class="accordion-body collapse ">
+            <div id="namespace-802009513" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1580,7 +1580,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.LookupPublicKeyById.html b/docs/classes/Threema.Console.Command.LookupPublicKeyById.html
index 2aaa206..9d1fb76 100644
--- a/docs/classes/Threema.Console.Command.LookupPublicKeyById.html
+++ b/docs/classes/Threema.Console.Command.LookupPublicKeyById.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-589214815"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2032472925"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-589214815" class="accordion-body collapse in">
+            <div id="namespace-2032472925" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-133528290"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1070565181"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-133528290" class="accordion-body collapse ">
+            <div id="namespace-1070565181" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1107956309"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2143969900"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1107956309" class="accordion-body collapse ">
+            <div id="namespace-2143969900" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1198944531"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1238615314"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1198944531" class="accordion-body collapse ">
+            <div id="namespace-1238615314" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1643225049"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-879364395"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1643225049" class="accordion-body collapse ">
+            <div id="namespace-879364395" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1966797842"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-125795675"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1966797842" class="accordion-body collapse ">
+            <div id="namespace-125795675" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1617019792"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-795181902"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1617019792" class="accordion-body collapse ">
+            <div id="namespace-795181902" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-152677403"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1271800976"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-152677403" class="accordion-body collapse ">
+            <div id="namespace-1271800976" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-708237780"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-453251922"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-708237780" class="accordion-body collapse ">
+            <div id="namespace-453251922" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1101305076"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-536161549"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1101305076" class="accordion-body collapse ">
+            <div id="namespace-536161549" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1311181726"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-112531486"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1311181726" class="accordion-body collapse ">
+            <div id="namespace-112531486" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-432014461"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2088916614"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-432014461" class="accordion-body collapse ">
+            <div id="namespace-2088916614" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1377731226"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-96115736"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1377731226" class="accordion-body collapse ">
+            <div id="namespace-96115736" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1273748586"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-205991030"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1273748586" class="accordion-body collapse ">
+            <div id="namespace-205991030" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1558,7 +1558,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.ReceiveMessage.html b/docs/classes/Threema.Console.Command.ReceiveMessage.html
index 2840d8e..0b3aba3 100644
--- a/docs/classes/Threema.Console.Command.ReceiveMessage.html
+++ b/docs/classes/Threema.Console.Command.ReceiveMessage.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-725796499"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-265097530"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-725796499" class="accordion-body collapse in">
+            <div id="namespace-265097530" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-219087194"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1223697913"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-219087194" class="accordion-body collapse ">
+            <div id="namespace-1223697913" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1295954172"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1266646869"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1295954172" class="accordion-body collapse ">
+            <div id="namespace-1266646869" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-806805901"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-147011519"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-806805901" class="accordion-body collapse ">
+            <div id="namespace-147011519" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1444367129"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-891021216"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1444367129" class="accordion-body collapse ">
+            <div id="namespace-891021216" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1811713337"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2043698348"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1811713337" class="accordion-body collapse ">
+            <div id="namespace-2043698348" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-491783402"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1204733573"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-491783402" class="accordion-body collapse ">
+            <div id="namespace-1204733573" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-324262555"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-833780985"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-324262555" class="accordion-body collapse ">
+            <div id="namespace-833780985" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1646506489"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1046651174"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1646506489" class="accordion-body collapse ">
+            <div id="namespace-1046651174" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-514917154"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-639205000"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-514917154" class="accordion-body collapse ">
+            <div id="namespace-639205000" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-308763051"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1778071312"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-308763051" class="accordion-body collapse ">
+            <div id="namespace-1778071312" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1314202862"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1938422778"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1314202862" class="accordion-body collapse ">
+            <div id="namespace-1938422778" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1299929432"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2120533109"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1299929432" class="accordion-body collapse ">
+            <div id="namespace-2120533109" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-686914935"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1342259010"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-686914935" class="accordion-body collapse ">
+            <div id="namespace-1342259010" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1602,7 +1602,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.SendE2EFile.html b/docs/classes/Threema.Console.Command.SendE2EFile.html
index 949eada..051e898 100644
--- a/docs/classes/Threema.Console.Command.SendE2EFile.html
+++ b/docs/classes/Threema.Console.Command.SendE2EFile.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1822058868"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-275607024"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1822058868" class="accordion-body collapse in">
+            <div id="namespace-275607024" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-903971705"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-883691772"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-903971705" class="accordion-body collapse ">
+            <div id="namespace-883691772" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1039155476"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1524713442"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1039155476" class="accordion-body collapse ">
+            <div id="namespace-1524713442" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1232652402"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1266128262"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1232652402" class="accordion-body collapse ">
+            <div id="namespace-1266128262" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-982867437"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-361209149"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-982867437" class="accordion-body collapse ">
+            <div id="namespace-361209149" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1925572696"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1581483137"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1925572696" class="accordion-body collapse ">
+            <div id="namespace-1581483137" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-228876614"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1672700690"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-228876614" class="accordion-body collapse ">
+            <div id="namespace-1672700690" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1132306444"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-536623017"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1132306444" class="accordion-body collapse ">
+            <div id="namespace-536623017" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-619628044"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1522794755"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-619628044" class="accordion-body collapse ">
+            <div id="namespace-1522794755" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1503865582"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-752544745"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1503865582" class="accordion-body collapse ">
+            <div id="namespace-752544745" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1216483352"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1023797786"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1216483352" class="accordion-body collapse ">
+            <div id="namespace-1023797786" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1446392544"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-961245760"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1446392544" class="accordion-body collapse ">
+            <div id="namespace-961245760" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1652785936"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-269291036"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1652785936" class="accordion-body collapse ">
+            <div id="namespace-269291036" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1169713796"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-537369012"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1169713796" class="accordion-body collapse ">
+            <div id="namespace-537369012" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1602,7 +1602,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.SendE2EImage.html b/docs/classes/Threema.Console.Command.SendE2EImage.html
index 327fa7b..adc2a8e 100644
--- a/docs/classes/Threema.Console.Command.SendE2EImage.html
+++ b/docs/classes/Threema.Console.Command.SendE2EImage.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-391823781"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1016537822"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-391823781" class="accordion-body collapse in">
+            <div id="namespace-1016537822" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-404743404"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1852003332"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-404743404" class="accordion-body collapse ">
+            <div id="namespace-1852003332" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1081120097"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-906250714"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1081120097" class="accordion-body collapse ">
+            <div id="namespace-906250714" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-421382507"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-221242519"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-421382507" class="accordion-body collapse ">
+            <div id="namespace-221242519" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1210471780"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-10714532"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1210471780" class="accordion-body collapse ">
+            <div id="namespace-10714532" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-549958095"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1583406581"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-549958095" class="accordion-body collapse ">
+            <div id="namespace-1583406581" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-991359158"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1200442006"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-991359158" class="accordion-body collapse ">
+            <div id="namespace-1200442006" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1486831047"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1687118240"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1486831047" class="accordion-body collapse ">
+            <div id="namespace-1687118240" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1247708416"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1361898738"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1247708416" class="accordion-body collapse ">
+            <div id="namespace-1361898738" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-114616169"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-884207282"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-114616169" class="accordion-body collapse ">
+            <div id="namespace-884207282" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1203828834"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1662217740"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1203828834" class="accordion-body collapse ">
+            <div id="namespace-1662217740" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-51178184"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1423093561"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-51178184" class="accordion-body collapse ">
+            <div id="namespace-1423093561" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2116562754"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2066035035"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2116562754" class="accordion-body collapse ">
+            <div id="namespace-2066035035" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-279575334"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-831919860"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-279575334" class="accordion-body collapse ">
+            <div id="namespace-831919860" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1580,7 +1580,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.SendE2EText.html b/docs/classes/Threema.Console.Command.SendE2EText.html
index 8d58a7a..225afbc 100644
--- a/docs/classes/Threema.Console.Command.SendE2EText.html
+++ b/docs/classes/Threema.Console.Command.SendE2EText.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1718436618"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1994038647"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1718436618" class="accordion-body collapse in">
+            <div id="namespace-1994038647" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1327905552"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1895137342"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1327905552" class="accordion-body collapse ">
+            <div id="namespace-1895137342" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-53302750"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-432916595"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-53302750" class="accordion-body collapse ">
+            <div id="namespace-432916595" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1426765474"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-669259693"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1426765474" class="accordion-body collapse ">
+            <div id="namespace-669259693" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1003980287"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2102666719"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1003980287" class="accordion-body collapse ">
+            <div id="namespace-2102666719" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1103925565"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1371711380"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1103925565" class="accordion-body collapse ">
+            <div id="namespace-1371711380" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-33588803"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1524353748"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-33588803" class="accordion-body collapse ">
+            <div id="namespace-1524353748" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-21815173"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1626454632"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-21815173" class="accordion-body collapse ">
+            <div id="namespace-1626454632" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-189401556"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-860321094"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-189401556" class="accordion-body collapse ">
+            <div id="namespace-860321094" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1907206957"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1040993832"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1907206957" class="accordion-body collapse ">
+            <div id="namespace-1040993832" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-822366504"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-552330354"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-822366504" class="accordion-body collapse ">
+            <div id="namespace-552330354" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1413533981"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-719192128"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1413533981" class="accordion-body collapse ">
+            <div id="namespace-719192128" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-328181031"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1959516163"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-328181031" class="accordion-body collapse ">
+            <div id="namespace-1959516163" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1363915372"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-240099468"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1363915372" class="accordion-body collapse ">
+            <div id="namespace-240099468" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1558,7 +1558,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Command.SendSimple.html b/docs/classes/Threema.Console.Command.SendSimple.html
index 0980b6b..b47541d 100644
--- a/docs/classes/Threema.Console.Command.SendSimple.html
+++ b/docs/classes/Threema.Console.Command.SendSimple.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2077983504"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1340979829"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-2077983504" class="accordion-body collapse in">
+            <div id="namespace-1340979829" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2116284794"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-671621225"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-2116284794" class="accordion-body collapse ">
+            <div id="namespace-671621225" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1422667739"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1546362139"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1422667739" class="accordion-body collapse ">
+            <div id="namespace-1546362139" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1422400224"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-312039161"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1422400224" class="accordion-body collapse ">
+            <div id="namespace-312039161" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-528400551"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-615435381"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-528400551" class="accordion-body collapse ">
+            <div id="namespace-615435381" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1080827124"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-583674558"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1080827124" class="accordion-body collapse ">
+            <div id="namespace-583674558" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1271295576"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-273988497"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1271295576" class="accordion-body collapse ">
+            <div id="namespace-273988497" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-224353072"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-603007612"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-224353072" class="accordion-body collapse ">
+            <div id="namespace-603007612" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1778832099"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1950594921"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1778832099" class="accordion-body collapse ">
+            <div id="namespace-1950594921" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2002072344"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1341541914"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-2002072344" class="accordion-body collapse ">
+            <div id="namespace-1341541914" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1481107023"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-238692476"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1481107023" class="accordion-body collapse ">
+            <div id="namespace-238692476" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-192196855"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-203634288"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-192196855" class="accordion-body collapse ">
+            <div id="namespace-203634288" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1382746495"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-344731815"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1382746495" class="accordion-body collapse ">
+            <div id="namespace-344731815" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2098530551"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1501529499"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2098530551" class="accordion-body collapse ">
+            <div id="namespace-1501529499" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1558,7 +1558,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Common.html b/docs/classes/Threema.Console.Common.html
index 2251e72..d76b909 100644
--- a/docs/classes/Threema.Console.Common.html
+++ b/docs/classes/Threema.Console.Common.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1880371747"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-70371132"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1880371747" class="accordion-body collapse in">
+            <div id="namespace-70371132" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1451212197"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1547085306"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1451212197" class="accordion-body collapse ">
+            <div id="namespace-1547085306" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-392370503"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2030224878"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-392370503" class="accordion-body collapse ">
+            <div id="namespace-2030224878" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1269302226"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1248044946"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1269302226" class="accordion-body collapse ">
+            <div id="namespace-1248044946" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-198180207"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1946253094"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-198180207" class="accordion-body collapse ">
+            <div id="namespace-1946253094" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2032523110"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1948046762"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-2032523110" class="accordion-body collapse ">
+            <div id="namespace-1948046762" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-922774876"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2004308593"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-922774876" class="accordion-body collapse ">
+            <div id="namespace-2004308593" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1131306498"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2094482260"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1131306498" class="accordion-body collapse ">
+            <div id="namespace-2094482260" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2141447671"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-299621595"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-2141447671" class="accordion-body collapse ">
+            <div id="namespace-299621595" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1513107945"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1133835136"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1513107945" class="accordion-body collapse ">
+            <div id="namespace-1133835136" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-434429371"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1011993772"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-434429371" class="accordion-body collapse ">
+            <div id="namespace-1011993772" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1711197658"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-358455511"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1711197658" class="accordion-body collapse ">
+            <div id="namespace-358455511" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-515391438"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-114316849"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-515391438" class="accordion-body collapse ">
+            <div id="namespace-114316849" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-711484029"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1699275860"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-711484029" class="accordion-body collapse ">
+            <div id="namespace-1699275860" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -907,7 +907,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Console.Run.html b/docs/classes/Threema.Console.Run.html
index 3220f51..59d6d5c 100644
--- a/docs/classes/Threema.Console.Run.html
+++ b/docs/classes/Threema.Console.Run.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-120455169"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1245289911"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-120455169" class="accordion-body collapse in">
+            <div id="namespace-1245289911" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-65530472"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1099056821"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-65530472" class="accordion-body collapse ">
+            <div id="namespace-1099056821" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-764603845"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1962556114"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-764603845" class="accordion-body collapse ">
+            <div id="namespace-1962556114" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1723606030"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2076989927"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1723606030" class="accordion-body collapse ">
+            <div id="namespace-2076989927" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1024947558"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-862611145"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1024947558" class="accordion-body collapse ">
+            <div id="namespace-862611145" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-90208648"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1607268653"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-90208648" class="accordion-body collapse ">
+            <div id="namespace-1607268653" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-312940237"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1975412074"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-312940237" class="accordion-body collapse ">
+            <div id="namespace-1975412074" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1783506776"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1405343418"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1783506776" class="accordion-body collapse ">
+            <div id="namespace-1405343418" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1740892770"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2004966805"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1740892770" class="accordion-body collapse ">
+            <div id="namespace-2004966805" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-358179424"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-49517643"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-358179424" class="accordion-body collapse ">
+            <div id="namespace-49517643" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1477780123"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1496457405"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1477780123" class="accordion-body collapse ">
+            <div id="namespace-1496457405" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-631740172"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-168874196"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-631740172" class="accordion-body collapse ">
+            <div id="namespace-168874196" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2063892554"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1239286528"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2063892554" class="accordion-body collapse ">
+            <div id="namespace-1239286528" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1365183671"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1127400631"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1365183671" class="accordion-body collapse ">
+            <div id="namespace-1127400631" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -912,7 +912,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Core.AssocArray.html b/docs/classes/Threema.Core.AssocArray.html
index 40baa93..e3a2a15 100644
--- a/docs/classes/Threema.Core.AssocArray.html
+++ b/docs/classes/Threema.Core.AssocArray.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-144893799"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1262366379"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-144893799" class="accordion-body collapse in">
+            <div id="namespace-1262366379" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-227236445"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1015216343"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-227236445" class="accordion-body collapse ">
+            <div id="namespace-1015216343" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-654219815"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-174381627"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-654219815" class="accordion-body collapse ">
+            <div id="namespace-174381627" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1714604846"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1732479557"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1714604846" class="accordion-body collapse ">
+            <div id="namespace-1732479557" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-806186950"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1103627144"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-806186950" class="accordion-body collapse ">
+            <div id="namespace-1103627144" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-385667719"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1944454332"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-385667719" class="accordion-body collapse ">
+            <div id="namespace-1944454332" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1081648885"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1306665185"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1081648885" class="accordion-body collapse ">
+            <div id="namespace-1306665185" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1915669533"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1865238976"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1915669533" class="accordion-body collapse ">
+            <div id="namespace-1865238976" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1526840249"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1035606404"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1526840249" class="accordion-body collapse ">
+            <div id="namespace-1035606404" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-60343779"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1565471032"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-60343779" class="accordion-body collapse ">
+            <div id="namespace-1565471032" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-968735472"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1782380185"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-968735472" class="accordion-body collapse ">
+            <div id="namespace-1782380185" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1173696877"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1185886111"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1173696877" class="accordion-body collapse ">
+            <div id="namespace-1185886111" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1141162204"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-774094099"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1141162204" class="accordion-body collapse ">
+            <div id="namespace-774094099" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2054637440"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1365993990"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2054637440" class="accordion-body collapse ">
+            <div id="namespace-1365993990" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -761,7 +761,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Core.Exception.html b/docs/classes/Threema.Core.Exception.html
index 5ef89ce..7585de2 100644
--- a/docs/classes/Threema.Core.Exception.html
+++ b/docs/classes/Threema.Core.Exception.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-856805820"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-736384692"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-856805820" class="accordion-body collapse in">
+            <div id="namespace-736384692" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1853608537"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-665579293"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1853608537" class="accordion-body collapse ">
+            <div id="namespace-665579293" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-389055678"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1500408731"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-389055678" class="accordion-body collapse ">
+            <div id="namespace-1500408731" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-910372585"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1306814405"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-910372585" class="accordion-body collapse ">
+            <div id="namespace-1306814405" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-705326280"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-598722526"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-705326280" class="accordion-body collapse ">
+            <div id="namespace-598722526" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1886163665"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1104431169"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1886163665" class="accordion-body collapse ">
+            <div id="namespace-1104431169" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1193966178"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1246218069"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1193966178" class="accordion-body collapse ">
+            <div id="namespace-1246218069" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1487607857"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-952655062"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1487607857" class="accordion-body collapse ">
+            <div id="namespace-952655062" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1458632198"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1862749597"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1458632198" class="accordion-body collapse ">
+            <div id="namespace-1862749597" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-515573467"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1400831165"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-515573467" class="accordion-body collapse ">
+            <div id="namespace-1400831165" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-522460057"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2143202585"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-522460057" class="accordion-body collapse ">
+            <div id="namespace-2143202585" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1871607829"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1682030865"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1871607829" class="accordion-body collapse ">
+            <div id="namespace-1682030865" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1309975260"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-527498471"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1309975260" class="accordion-body collapse ">
+            <div id="namespace-527498471" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1628655949"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1448674623"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1628655949" class="accordion-body collapse ">
+            <div id="namespace-1448674623" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -599,7 +599,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Core.KeyPair.html b/docs/classes/Threema.Core.KeyPair.html
index 64cb3be..7f96441 100644
--- a/docs/classes/Threema.Core.KeyPair.html
+++ b/docs/classes/Threema.Core.KeyPair.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-966197667"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-721234188"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-966197667" class="accordion-body collapse in">
+            <div id="namespace-721234188" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-606286528"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2135091018"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-606286528" class="accordion-body collapse ">
+            <div id="namespace-2135091018" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-425436427"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2035626614"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-425436427" class="accordion-body collapse ">
+            <div id="namespace-2035626614" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1543894991"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2050995755"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1543894991" class="accordion-body collapse ">
+            <div id="namespace-2050995755" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1092882235"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1822401457"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1092882235" class="accordion-body collapse ">
+            <div id="namespace-1822401457" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1843842847"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1349023734"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1843842847" class="accordion-body collapse ">
+            <div id="namespace-1349023734" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-533390139"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-959953760"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-533390139" class="accordion-body collapse ">
+            <div id="namespace-959953760" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-493003762"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1741553026"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-493003762" class="accordion-body collapse ">
+            <div id="namespace-1741553026" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1530013025"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-133362721"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1530013025" class="accordion-body collapse ">
+            <div id="namespace-133362721" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-898294323"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1455298828"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-898294323" class="accordion-body collapse ">
+            <div id="namespace-1455298828" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-577300592"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1761218105"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-577300592" class="accordion-body collapse ">
+            <div id="namespace-1761218105" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1690664081"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-943056051"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1690664081" class="accordion-body collapse ">
+            <div id="namespace-943056051" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-5092151"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1746805665"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-5092151" class="accordion-body collapse ">
+            <div id="namespace-1746805665" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1622569273"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1967924426"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1622569273" class="accordion-body collapse ">
+            <div id="namespace-1967924426" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -699,7 +699,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.Core.Url.html b/docs/classes/Threema.Core.Url.html
index 9227277..76594c9 100644
--- a/docs/classes/Threema.Core.Url.html
+++ b/docs/classes/Threema.Core.Url.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1354942755"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1907844066"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1354942755" class="accordion-body collapse in">
+            <div id="namespace-1907844066" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-97855692"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1140456053"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-97855692" class="accordion-body collapse ">
+            <div id="namespace-1140456053" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-470252484"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-639154204"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-470252484" class="accordion-body collapse ">
+            <div id="namespace-639154204" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1378247264"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1721033916"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1378247264" class="accordion-body collapse ">
+            <div id="namespace-1721033916" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1308543824"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-341764698"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1308543824" class="accordion-body collapse ">
+            <div id="namespace-341764698" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1057058063"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-115461684"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1057058063" class="accordion-body collapse ">
+            <div id="namespace-115461684" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1228728423"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-302286417"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1228728423" class="accordion-body collapse ">
+            <div id="namespace-302286417" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-984137241"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-569778175"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-984137241" class="accordion-body collapse ">
+            <div id="namespace-569778175" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-442315337"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2114706280"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-442315337" class="accordion-body collapse ">
+            <div id="namespace-2114706280" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-288474538"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-22262451"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-288474538" class="accordion-body collapse ">
+            <div id="namespace-22262451" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-186061497"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1480605793"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-186061497" class="accordion-body collapse ">
+            <div id="namespace-1480605793" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1665182386"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-781452215"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1665182386" class="accordion-body collapse ">
+            <div id="namespace-781452215" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1831744507"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-520951966"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1831744507" class="accordion-body collapse ">
+            <div id="namespace-520951966" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1600964871"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-351364428"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1600964871" class="accordion-body collapse ">
+            <div id="namespace-351364428" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -924,7 +924,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.Capability.html b/docs/classes/Threema.MsgApi.Commands.Capability.html
index 904b716..02c2736 100644
--- a/docs/classes/Threema.MsgApi.Commands.Capability.html
+++ b/docs/classes/Threema.MsgApi.Commands.Capability.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-550521704"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1115403419"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-550521704" class="accordion-body collapse in">
+            <div id="namespace-1115403419" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1449486067"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2120723045"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1449486067" class="accordion-body collapse ">
+            <div id="namespace-2120723045" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-868456917"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-490494432"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-868456917" class="accordion-body collapse ">
+            <div id="namespace-490494432" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-953763514"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-567532656"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-953763514" class="accordion-body collapse ">
+            <div id="namespace-567532656" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-315328206"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1102085477"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-315328206" class="accordion-body collapse ">
+            <div id="namespace-1102085477" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1162167835"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2006384002"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1162167835" class="accordion-body collapse ">
+            <div id="namespace-2006384002" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1222388909"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1414890093"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1222388909" class="accordion-body collapse ">
+            <div id="namespace-1414890093" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1761154706"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1534335135"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1761154706" class="accordion-body collapse ">
+            <div id="namespace-1534335135" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-852466948"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1271638934"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-852466948" class="accordion-body collapse ">
+            <div id="namespace-1271638934" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-255613944"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-982125116"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-255613944" class="accordion-body collapse ">
+            <div id="namespace-982125116" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-919870975"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-165391147"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-919870975" class="accordion-body collapse ">
+            <div id="namespace-165391147" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1888409584"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-365206721"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1888409584" class="accordion-body collapse ">
+            <div id="namespace-365206721" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2142935151"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1263913189"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2142935151" class="accordion-body collapse ">
+            <div id="namespace-1263913189" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1648072031"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-188685513"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1648072031" class="accordion-body collapse ">
+            <div id="namespace-188685513" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -771,7 +771,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.CommandInterface.html b/docs/classes/Threema.MsgApi.Commands.CommandInterface.html
index 039ea3c..18489bc 100644
--- a/docs/classes/Threema.MsgApi.Commands.CommandInterface.html
+++ b/docs/classes/Threema.MsgApi.Commands.CommandInterface.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-154784020"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-539137836"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-154784020" class="accordion-body collapse in">
+            <div id="namespace-539137836" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1562164074"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-781522014"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1562164074" class="accordion-body collapse ">
+            <div id="namespace-781522014" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1283994706"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-148323750"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1283994706" class="accordion-body collapse ">
+            <div id="namespace-148323750" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-991935467"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2119670054"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-991935467" class="accordion-body collapse ">
+            <div id="namespace-2119670054" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-792030870"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-419788591"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-792030870" class="accordion-body collapse ">
+            <div id="namespace-419788591" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1974749050"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-977817987"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1974749050" class="accordion-body collapse ">
+            <div id="namespace-977817987" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1092423988"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1666871461"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1092423988" class="accordion-body collapse ">
+            <div id="namespace-1666871461" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-79450228"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-215476089"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-79450228" class="accordion-body collapse ">
+            <div id="namespace-215476089" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-199403205"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1606767150"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-199403205" class="accordion-body collapse ">
+            <div id="namespace-1606767150" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-923587741"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1455336451"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-923587741" class="accordion-body collapse ">
+            <div id="namespace-1455336451" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-46775609"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1726639766"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-46775609" class="accordion-body collapse ">
+            <div id="namespace-1726639766" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1149191202"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-590731580"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1149191202" class="accordion-body collapse ">
+            <div id="namespace-590731580" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1480020402"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-300135776"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1480020402" class="accordion-body collapse ">
+            <div id="namespace-300135776" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1192922465"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-407756639"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1192922465" class="accordion-body collapse ">
+            <div id="namespace-407756639" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -681,7 +681,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.Credits.html b/docs/classes/Threema.MsgApi.Commands.Credits.html
index c4e90d3..e3a90fb 100644
--- a/docs/classes/Threema.MsgApi.Commands.Credits.html
+++ b/docs/classes/Threema.MsgApi.Commands.Credits.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1881276792"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-510750499"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1881276792" class="accordion-body collapse in">
+            <div id="namespace-510750499" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1641184810"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-873185592"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1641184810" class="accordion-body collapse ">
+            <div id="namespace-873185592" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1599110973"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1474517375"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1599110973" class="accordion-body collapse ">
+            <div id="namespace-1474517375" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-75703152"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1172620864"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-75703152" class="accordion-body collapse ">
+            <div id="namespace-1172620864" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-61402043"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-670152894"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-61402043" class="accordion-body collapse ">
+            <div id="namespace-670152894" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2102517743"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-13884461"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-2102517743" class="accordion-body collapse ">
+            <div id="namespace-13884461" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1661599505"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-545599992"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1661599505" class="accordion-body collapse ">
+            <div id="namespace-545599992" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-807033797"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1384443607"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-807033797" class="accordion-body collapse ">
+            <div id="namespace-1384443607" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-670821731"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1925269053"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-670821731" class="accordion-body collapse ">
+            <div id="namespace-1925269053" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1786047373"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1950922019"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1786047373" class="accordion-body collapse ">
+            <div id="namespace-1950922019" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1913045343"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1862302665"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1913045343" class="accordion-body collapse ">
+            <div id="namespace-1862302665" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-820147812"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1368195566"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-820147812" class="accordion-body collapse ">
+            <div id="namespace-1368195566" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1919892019"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2031529431"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1919892019" class="accordion-body collapse ">
+            <div id="namespace-2031529431" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1367250252"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1176375071"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1367250252" class="accordion-body collapse ">
+            <div id="namespace-1176375071" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -704,7 +704,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.DownloadFile.html b/docs/classes/Threema.MsgApi.Commands.DownloadFile.html
index 3767c2d..c28a0fe 100644
--- a/docs/classes/Threema.MsgApi.Commands.DownloadFile.html
+++ b/docs/classes/Threema.MsgApi.Commands.DownloadFile.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-723964241"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-816415854"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-723964241" class="accordion-body collapse in">
+            <div id="namespace-816415854" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-602429548"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-917531905"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-602429548" class="accordion-body collapse ">
+            <div id="namespace-917531905" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-425350329"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-675735355"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-425350329" class="accordion-body collapse ">
+            <div id="namespace-675735355" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1054133702"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-686771125"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1054133702" class="accordion-body collapse ">
+            <div id="namespace-686771125" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-210936326"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1985459811"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-210936326" class="accordion-body collapse ">
+            <div id="namespace-1985459811" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1620737015"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1472433787"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1620737015" class="accordion-body collapse ">
+            <div id="namespace-1472433787" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-944706106"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2112575882"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-944706106" class="accordion-body collapse ">
+            <div id="namespace-2112575882" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1393991135"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-163950811"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1393991135" class="accordion-body collapse ">
+            <div id="namespace-163950811" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1383931145"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-51360281"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1383931145" class="accordion-body collapse ">
+            <div id="namespace-51360281" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-276875723"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-582698740"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-276875723" class="accordion-body collapse ">
+            <div id="namespace-582698740" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-726672536"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1379604361"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-726672536" class="accordion-body collapse ">
+            <div id="namespace-1379604361" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-465674531"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-703114588"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-465674531" class="accordion-body collapse ">
+            <div id="namespace-703114588" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1864167753"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1713611671"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1864167753" class="accordion-body collapse ">
+            <div id="namespace-1713611671" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1929587441"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-273146565"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1929587441" class="accordion-body collapse ">
+            <div id="namespace-273146565" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -771,7 +771,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.FetchPublicKey.html b/docs/classes/Threema.MsgApi.Commands.FetchPublicKey.html
index e80d2b4..0a65887 100644
--- a/docs/classes/Threema.MsgApi.Commands.FetchPublicKey.html
+++ b/docs/classes/Threema.MsgApi.Commands.FetchPublicKey.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-197296063"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1641934570"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-197296063" class="accordion-body collapse in">
+            <div id="namespace-1641934570" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1749555561"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-72783458"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1749555561" class="accordion-body collapse ">
+            <div id="namespace-72783458" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-888705092"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1314778449"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-888705092" class="accordion-body collapse ">
+            <div id="namespace-1314778449" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2111730144"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-415734080"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-2111730144" class="accordion-body collapse ">
+            <div id="namespace-415734080" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1308586257"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-659942962"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1308586257" class="accordion-body collapse ">
+            <div id="namespace-659942962" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1423831864"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1282400082"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1423831864" class="accordion-body collapse ">
+            <div id="namespace-1282400082" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1745483385"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-954653436"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1745483385" class="accordion-body collapse ">
+            <div id="namespace-954653436" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-698399441"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1692529678"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-698399441" class="accordion-body collapse ">
+            <div id="namespace-1692529678" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1318653300"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1603309407"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1318653300" class="accordion-body collapse ">
+            <div id="namespace-1603309407" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-785373708"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-629821029"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-785373708" class="accordion-body collapse ">
+            <div id="namespace-629821029" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-74756608"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-491649792"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-74756608" class="accordion-body collapse ">
+            <div id="namespace-491649792" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-236839481"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1215861259"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-236839481" class="accordion-body collapse ">
+            <div id="namespace-1215861259" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1262223367"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-510262464"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1262223367" class="accordion-body collapse ">
+            <div id="namespace-510262464" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-350017710"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2004496820"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-350017710" class="accordion-body collapse ">
+            <div id="namespace-2004496820" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -771,7 +771,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.LookupEmail.html b/docs/classes/Threema.MsgApi.Commands.LookupEmail.html
index edd30bb..4ce05a2 100644
--- a/docs/classes/Threema.MsgApi.Commands.LookupEmail.html
+++ b/docs/classes/Threema.MsgApi.Commands.LookupEmail.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-986899359"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1663606963"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-986899359" class="accordion-body collapse in">
+            <div id="namespace-1663606963" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-315313339"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1289622591"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-315313339" class="accordion-body collapse ">
+            <div id="namespace-1289622591" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-8837875"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1735830993"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-8837875" class="accordion-body collapse ">
+            <div id="namespace-1735830993" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1852370537"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-638326715"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1852370537" class="accordion-body collapse ">
+            <div id="namespace-638326715" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2087804708"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1467209060"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-2087804708" class="accordion-body collapse ">
+            <div id="namespace-1467209060" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1060455825"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1757017856"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1060455825" class="accordion-body collapse ">
+            <div id="namespace-1757017856" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1472715457"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1067809599"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1472715457" class="accordion-body collapse ">
+            <div id="namespace-1067809599" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1115667259"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1873712179"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1115667259" class="accordion-body collapse ">
+            <div id="namespace-1873712179" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1872452331"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-65503237"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1872452331" class="accordion-body collapse ">
+            <div id="namespace-65503237" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-254812963"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-931752628"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-254812963" class="accordion-body collapse ">
+            <div id="namespace-931752628" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1102637265"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1472209293"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1102637265" class="accordion-body collapse ">
+            <div id="namespace-1472209293" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1566783291"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2091725352"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1566783291" class="accordion-body collapse ">
+            <div id="namespace-2091725352" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1159885643"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1309073708"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1159885643" class="accordion-body collapse ">
+            <div id="namespace-1309073708" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-79961961"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-992417458"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-79961961" class="accordion-body collapse ">
+            <div id="namespace-992417458" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -800,7 +800,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.LookupPhone.html b/docs/classes/Threema.MsgApi.Commands.LookupPhone.html
index ca0b2cf..0f57fa8 100644
--- a/docs/classes/Threema.MsgApi.Commands.LookupPhone.html
+++ b/docs/classes/Threema.MsgApi.Commands.LookupPhone.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1076865516"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-689390279"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1076865516" class="accordion-body collapse in">
+            <div id="namespace-689390279" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2026399135"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-833018244"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-2026399135" class="accordion-body collapse ">
+            <div id="namespace-833018244" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-758492690"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-623212849"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-758492690" class="accordion-body collapse ">
+            <div id="namespace-623212849" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-533544697"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1791380570"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-533544697" class="accordion-body collapse ">
+            <div id="namespace-1791380570" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1772428447"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-564523318"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1772428447" class="accordion-body collapse ">
+            <div id="namespace-564523318" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2118929238"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1850828580"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-2118929238" class="accordion-body collapse ">
+            <div id="namespace-1850828580" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1251303958"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2123757300"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1251303958" class="accordion-body collapse ">
+            <div id="namespace-2123757300" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-708896106"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-535855312"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-708896106" class="accordion-body collapse ">
+            <div id="namespace-535855312" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1451608338"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-121847293"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1451608338" class="accordion-body collapse ">
+            <div id="namespace-121847293" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-669484206"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1598805736"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-669484206" class="accordion-body collapse ">
+            <div id="namespace-1598805736" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1759261542"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-600554986"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1759261542" class="accordion-body collapse ">
+            <div id="namespace-600554986" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-311918048"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1513546607"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-311918048" class="accordion-body collapse ">
+            <div id="namespace-1513546607" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-453664143"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1699182225"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-453664143" class="accordion-body collapse ">
+            <div id="namespace-1699182225" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-335680303"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1704051726"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-335680303" class="accordion-body collapse ">
+            <div id="namespace-1704051726" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -800,7 +800,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.MultiPartCommandInterface.html b/docs/classes/Threema.MsgApi.Commands.MultiPartCommandInterface.html
index 8fda879..0d1e7df 100644
--- a/docs/classes/Threema.MsgApi.Commands.MultiPartCommandInterface.html
+++ b/docs/classes/Threema.MsgApi.Commands.MultiPartCommandInterface.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1122898714"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1858236231"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1122898714" class="accordion-body collapse in">
+            <div id="namespace-1858236231" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-21245753"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1411459718"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-21245753" class="accordion-body collapse ">
+            <div id="namespace-1411459718" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-807630296"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1646347535"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-807630296" class="accordion-body collapse ">
+            <div id="namespace-1646347535" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-711455169"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-884160128"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-711455169" class="accordion-body collapse ">
+            <div id="namespace-884160128" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-645581190"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1726629207"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-645581190" class="accordion-body collapse ">
+            <div id="namespace-1726629207" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2044894528"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1302963264"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-2044894528" class="accordion-body collapse ">
+            <div id="namespace-1302963264" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-169182713"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1286160347"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-169182713" class="accordion-body collapse ">
+            <div id="namespace-1286160347" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-619402093"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-620088647"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-619402093" class="accordion-body collapse ">
+            <div id="namespace-620088647" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1301506930"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1812743458"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1301506930" class="accordion-body collapse ">
+            <div id="namespace-1812743458" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-539246344"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-239808037"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-539246344" class="accordion-body collapse ">
+            <div id="namespace-239808037" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2019240841"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-640678131"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-2019240841" class="accordion-body collapse ">
+            <div id="namespace-640678131" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-418878680"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1035521983"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-418878680" class="accordion-body collapse ">
+            <div id="namespace-1035521983" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1020377894"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1724507072"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1020377894" class="accordion-body collapse ">
+            <div id="namespace-1724507072" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1900168153"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1247463195"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1900168153" class="accordion-body collapse ">
+            <div id="namespace-1247463195" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -716,7 +716,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.Results.CapabilityResult.html b/docs/classes/Threema.MsgApi.Commands.Results.CapabilityResult.html
index e49150c..121622f 100644
--- a/docs/classes/Threema.MsgApi.Commands.Results.CapabilityResult.html
+++ b/docs/classes/Threema.MsgApi.Commands.Results.CapabilityResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1190655468"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1468330862"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1190655468" class="accordion-body collapse in">
+            <div id="namespace-1468330862" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1118246297"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-43877771"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1118246297" class="accordion-body collapse ">
+            <div id="namespace-43877771" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1140371433"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-394117765"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1140371433" class="accordion-body collapse ">
+            <div id="namespace-394117765" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-338252959"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1441263725"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-338252959" class="accordion-body collapse ">
+            <div id="namespace-1441263725" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1361661162"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2040067382"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1361661162" class="accordion-body collapse ">
+            <div id="namespace-2040067382" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-449497309"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-636705303"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-449497309" class="accordion-body collapse ">
+            <div id="namespace-636705303" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-558362"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1373103474"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-558362" class="accordion-body collapse ">
+            <div id="namespace-1373103474" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-899966371"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-149896779"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-899966371" class="accordion-body collapse ">
+            <div id="namespace-149896779" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-539168204"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-759833107"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-539168204" class="accordion-body collapse ">
+            <div id="namespace-759833107" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2043875195"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-798903450"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-2043875195" class="accordion-body collapse ">
+            <div id="namespace-798903450" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-971553512"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-945251267"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-971553512" class="accordion-body collapse ">
+            <div id="namespace-945251267" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2053586125"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1535784510"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-2053586125" class="accordion-body collapse ">
+            <div id="namespace-1535784510" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1338776806"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-220114264"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1338776806" class="accordion-body collapse ">
+            <div id="namespace-220114264" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-288276698"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1554209853"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-288276698" class="accordion-body collapse ">
+            <div id="namespace-1554209853" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1137,7 +1137,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.Results.CreditsResult.html b/docs/classes/Threema.MsgApi.Commands.Results.CreditsResult.html
index e8760c0..6a005e2 100644
--- a/docs/classes/Threema.MsgApi.Commands.Results.CreditsResult.html
+++ b/docs/classes/Threema.MsgApi.Commands.Results.CreditsResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-972224999"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1973495522"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-972224999" class="accordion-body collapse in">
+            <div id="namespace-1973495522" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1959747263"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-487937299"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1959747263" class="accordion-body collapse ">
+            <div id="namespace-487937299" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2003834612"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-847602175"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-2003834612" class="accordion-body collapse ">
+            <div id="namespace-847602175" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-47113822"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1649425107"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-47113822" class="accordion-body collapse ">
+            <div id="namespace-1649425107" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-626882937"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-664146019"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-626882937" class="accordion-body collapse ">
+            <div id="namespace-664146019" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-579736440"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1118415378"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-579736440" class="accordion-body collapse ">
+            <div id="namespace-1118415378" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-203703527"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-68836634"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-203703527" class="accordion-body collapse ">
+            <div id="namespace-68836634" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1307546539"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1613958101"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1307546539" class="accordion-body collapse ">
+            <div id="namespace-1613958101" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1800495229"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1918139495"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1800495229" class="accordion-body collapse ">
+            <div id="namespace-1918139495" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1792301957"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-304408804"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1792301957" class="accordion-body collapse ">
+            <div id="namespace-304408804" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1554699173"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1170863849"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1554699173" class="accordion-body collapse ">
+            <div id="namespace-1170863849" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1462139588"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1849389051"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1462139588" class="accordion-body collapse ">
+            <div id="namespace-1849389051" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1662218384"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-826817001"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1662218384" class="accordion-body collapse ">
+            <div id="namespace-826817001" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-925936011"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-437556541"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-925936011" class="accordion-body collapse ">
+            <div id="namespace-437556541" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -958,7 +958,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.Results.DownloadFileResult.html b/docs/classes/Threema.MsgApi.Commands.Results.DownloadFileResult.html
index eee2118..f8357a1 100644
--- a/docs/classes/Threema.MsgApi.Commands.Results.DownloadFileResult.html
+++ b/docs/classes/Threema.MsgApi.Commands.Results.DownloadFileResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1226720821"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2101839284"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1226720821" class="accordion-body collapse in">
+            <div id="namespace-2101839284" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1230841998"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1853305641"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1230841998" class="accordion-body collapse ">
+            <div id="namespace-1853305641" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-850554616"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1884051762"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-850554616" class="accordion-body collapse ">
+            <div id="namespace-1884051762" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1559511392"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-931685013"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1559511392" class="accordion-body collapse ">
+            <div id="namespace-931685013" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-664247196"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1446077165"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-664247196" class="accordion-body collapse ">
+            <div id="namespace-1446077165" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-573118771"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1494294718"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-573118771" class="accordion-body collapse ">
+            <div id="namespace-1494294718" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1655851159"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1369727358"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1655851159" class="accordion-body collapse ">
+            <div id="namespace-1369727358" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-587057317"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1902071764"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-587057317" class="accordion-body collapse ">
+            <div id="namespace-1902071764" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-108015708"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1936278513"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-108015708" class="accordion-body collapse ">
+            <div id="namespace-1936278513" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1506212307"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-939378477"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1506212307" class="accordion-body collapse ">
+            <div id="namespace-939378477" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-277093048"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1243884965"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-277093048" class="accordion-body collapse ">
+            <div id="namespace-1243884965" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1787402168"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1680961688"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1787402168" class="accordion-body collapse ">
+            <div id="namespace-1680961688" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-835737202"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-18964964"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-835737202" class="accordion-body collapse ">
+            <div id="namespace-18964964" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1214276606"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1108397729"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1214276606" class="accordion-body collapse ">
+            <div id="namespace-1108397729" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -958,7 +958,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.Results.FetchPublicKeyResult.html b/docs/classes/Threema.MsgApi.Commands.Results.FetchPublicKeyResult.html
index 2e6a372..1e2d222 100644
--- a/docs/classes/Threema.MsgApi.Commands.Results.FetchPublicKeyResult.html
+++ b/docs/classes/Threema.MsgApi.Commands.Results.FetchPublicKeyResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-782150695"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-516249392"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-782150695" class="accordion-body collapse in">
+            <div id="namespace-516249392" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-413340915"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-697489598"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-413340915" class="accordion-body collapse ">
+            <div id="namespace-697489598" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1849667646"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-472548251"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1849667646" class="accordion-body collapse ">
+            <div id="namespace-472548251" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-733526318"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2033484394"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-733526318" class="accordion-body collapse ">
+            <div id="namespace-2033484394" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-78581053"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1165850066"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-78581053" class="accordion-body collapse ">
+            <div id="namespace-1165850066" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1713188653"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-50838408"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1713188653" class="accordion-body collapse ">
+            <div id="namespace-50838408" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-110476306"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-494813978"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-110476306" class="accordion-body collapse ">
+            <div id="namespace-494813978" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2020603997"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-783570597"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-2020603997" class="accordion-body collapse ">
+            <div id="namespace-783570597" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-958002791"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-148538419"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-958002791" class="accordion-body collapse ">
+            <div id="namespace-148538419" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-567554049"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1561852733"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-567554049" class="accordion-body collapse ">
+            <div id="namespace-1561852733" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-133783823"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-256094514"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-133783823" class="accordion-body collapse ">
+            <div id="namespace-256094514" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1344628721"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1758526529"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1344628721" class="accordion-body collapse ">
+            <div id="namespace-1758526529" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1686862807"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2093747778"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1686862807" class="accordion-body collapse ">
+            <div id="namespace-2093747778" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-715103797"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1744211151"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-715103797" class="accordion-body collapse ">
+            <div id="namespace-1744211151" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -958,7 +958,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.Results.LookupIdResult.html b/docs/classes/Threema.MsgApi.Commands.Results.LookupIdResult.html
index 7d6d5b8..d75f9bd 100644
--- a/docs/classes/Threema.MsgApi.Commands.Results.LookupIdResult.html
+++ b/docs/classes/Threema.MsgApi.Commands.Results.LookupIdResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1115374637"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-621310786"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1115374637" class="accordion-body collapse in">
+            <div id="namespace-621310786" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1491773230"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1385996186"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1491773230" class="accordion-body collapse ">
+            <div id="namespace-1385996186" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2078824771"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1547788518"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-2078824771" class="accordion-body collapse ">
+            <div id="namespace-1547788518" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-719368415"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-30536564"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-719368415" class="accordion-body collapse ">
+            <div id="namespace-30536564" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1875886559"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-394415062"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1875886559" class="accordion-body collapse ">
+            <div id="namespace-394415062" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1244683743"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1626887516"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1244683743" class="accordion-body collapse ">
+            <div id="namespace-1626887516" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-408695095"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1210611479"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-408695095" class="accordion-body collapse ">
+            <div id="namespace-1210611479" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1822041173"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-670964210"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1822041173" class="accordion-body collapse ">
+            <div id="namespace-670964210" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1038320390"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1974419923"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1038320390" class="accordion-body collapse ">
+            <div id="namespace-1974419923" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2014415769"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1280028032"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-2014415769" class="accordion-body collapse ">
+            <div id="namespace-1280028032" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1262185607"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-71365969"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1262185607" class="accordion-body collapse ">
+            <div id="namespace-71365969" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1548653781"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1288966986"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1548653781" class="accordion-body collapse ">
+            <div id="namespace-1288966986" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-87835680"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-78650618"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-87835680" class="accordion-body collapse ">
+            <div id="namespace-78650618" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-113131608"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-967313950"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-113131608" class="accordion-body collapse ">
+            <div id="namespace-967313950" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -958,7 +958,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.Results.Result.html b/docs/classes/Threema.MsgApi.Commands.Results.Result.html
index ffc47db..a3c1538 100644
--- a/docs/classes/Threema.MsgApi.Commands.Results.Result.html
+++ b/docs/classes/Threema.MsgApi.Commands.Results.Result.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-627295968"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-588634515"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-627295968" class="accordion-body collapse in">
+            <div id="namespace-588634515" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1444003884"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1803558577"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1444003884" class="accordion-body collapse ">
+            <div id="namespace-1803558577" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1517823489"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1541438568"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1517823489" class="accordion-body collapse ">
+            <div id="namespace-1541438568" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1042347513"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-856263729"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1042347513" class="accordion-body collapse ">
+            <div id="namespace-856263729" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-897327955"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-451121825"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-897327955" class="accordion-body collapse ">
+            <div id="namespace-451121825" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1107626773"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-846109103"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1107626773" class="accordion-body collapse ">
+            <div id="namespace-846109103" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-897749023"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-385174358"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-897749023" class="accordion-body collapse ">
+            <div id="namespace-385174358" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2045560810"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1910803072"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-2045560810" class="accordion-body collapse ">
+            <div id="namespace-1910803072" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-16124277"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1874309510"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-16124277" class="accordion-body collapse ">
+            <div id="namespace-1874309510" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-736675733"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-205007925"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-736675733" class="accordion-body collapse ">
+            <div id="namespace-205007925" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1927748967"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-670763060"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1927748967" class="accordion-body collapse ">
+            <div id="namespace-670763060" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-546807401"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-423868917"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-546807401" class="accordion-body collapse ">
+            <div id="namespace-423868917" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1394502821"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-277261690"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1394502821" class="accordion-body collapse ">
+            <div id="namespace-277261690" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1848486506"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1093028559"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1848486506" class="accordion-body collapse ">
+            <div id="namespace-1093028559" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -891,7 +891,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.Results.SendE2EResult.html b/docs/classes/Threema.MsgApi.Commands.Results.SendE2EResult.html
index 079bf39..ece7e21 100644
--- a/docs/classes/Threema.MsgApi.Commands.Results.SendE2EResult.html
+++ b/docs/classes/Threema.MsgApi.Commands.Results.SendE2EResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1015792950"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1174780557"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1015792950" class="accordion-body collapse in">
+            <div id="namespace-1174780557" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1304087452"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1821722821"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1304087452" class="accordion-body collapse ">
+            <div id="namespace-1821722821" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-408418887"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-861088131"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-408418887" class="accordion-body collapse ">
+            <div id="namespace-861088131" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-333403891"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1864329062"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-333403891" class="accordion-body collapse ">
+            <div id="namespace-1864329062" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1630459808"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1326052983"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1630459808" class="accordion-body collapse ">
+            <div id="namespace-1326052983" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1251463113"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2122468790"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1251463113" class="accordion-body collapse ">
+            <div id="namespace-2122468790" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1866300815"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1140689473"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1866300815" class="accordion-body collapse ">
+            <div id="namespace-1140689473" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1893013028"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1470591497"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1893013028" class="accordion-body collapse ">
+            <div id="namespace-1470591497" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-530122770"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-246410141"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-530122770" class="accordion-body collapse ">
+            <div id="namespace-246410141" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1149321469"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-330698865"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1149321469" class="accordion-body collapse ">
+            <div id="namespace-330698865" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-656393481"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-462534780"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-656393481" class="accordion-body collapse ">
+            <div id="namespace-462534780" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1762655996"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-984753402"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1762655996" class="accordion-body collapse ">
+            <div id="namespace-984753402" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1943923158"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1014042121"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1943923158" class="accordion-body collapse ">
+            <div id="namespace-1014042121" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1625021272"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-936781693"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1625021272" class="accordion-body collapse ">
+            <div id="namespace-936781693" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -956,7 +956,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.Results.SendSimpleResult.html b/docs/classes/Threema.MsgApi.Commands.Results.SendSimpleResult.html
index 4f2b9c6..fd688e7 100644
--- a/docs/classes/Threema.MsgApi.Commands.Results.SendSimpleResult.html
+++ b/docs/classes/Threema.MsgApi.Commands.Results.SendSimpleResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-216423248"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1107946125"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-216423248" class="accordion-body collapse in">
+            <div id="namespace-1107946125" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-979661086"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1972235589"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-979661086" class="accordion-body collapse ">
+            <div id="namespace-1972235589" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1968652274"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1384004021"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1968652274" class="accordion-body collapse ">
+            <div id="namespace-1384004021" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1326515332"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1894335008"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1326515332" class="accordion-body collapse ">
+            <div id="namespace-1894335008" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1863101122"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1088606825"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1863101122" class="accordion-body collapse ">
+            <div id="namespace-1088606825" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-215750603"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1002565682"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-215750603" class="accordion-body collapse ">
+            <div id="namespace-1002565682" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-986010636"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-598662449"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-986010636" class="accordion-body collapse ">
+            <div id="namespace-598662449" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2021398776"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1679605260"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-2021398776" class="accordion-body collapse ">
+            <div id="namespace-1679605260" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-255890587"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-779676237"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-255890587" class="accordion-body collapse ">
+            <div id="namespace-779676237" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1854669164"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1800190443"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1854669164" class="accordion-body collapse ">
+            <div id="namespace-1800190443" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-673863079"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1098738907"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-673863079" class="accordion-body collapse ">
+            <div id="namespace-1098738907" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-71751601"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-216146500"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-71751601" class="accordion-body collapse ">
+            <div id="namespace-216146500" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-984834238"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-389038165"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-984834238" class="accordion-body collapse ">
+            <div id="namespace-389038165" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-966231050"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-290786023"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-966231050" class="accordion-body collapse ">
+            <div id="namespace-290786023" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -958,7 +958,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.Results.UploadFileResult.html b/docs/classes/Threema.MsgApi.Commands.Results.UploadFileResult.html
index 1c1ecfb..3774974 100644
--- a/docs/classes/Threema.MsgApi.Commands.Results.UploadFileResult.html
+++ b/docs/classes/Threema.MsgApi.Commands.Results.UploadFileResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-11394275"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-982645075"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-11394275" class="accordion-body collapse in">
+            <div id="namespace-982645075" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2050548773"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1270600667"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-2050548773" class="accordion-body collapse ">
+            <div id="namespace-1270600667" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1577530672"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-181961235"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1577530672" class="accordion-body collapse ">
+            <div id="namespace-181961235" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-367570879"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-926688356"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-367570879" class="accordion-body collapse ">
+            <div id="namespace-926688356" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-868552173"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1693804328"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-868552173" class="accordion-body collapse ">
+            <div id="namespace-1693804328" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-980822251"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-696375117"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-980822251" class="accordion-body collapse ">
+            <div id="namespace-696375117" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1398150917"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-996388543"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1398150917" class="accordion-body collapse ">
+            <div id="namespace-996388543" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1663682558"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-345056797"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1663682558" class="accordion-body collapse ">
+            <div id="namespace-345056797" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1669432338"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-862350253"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1669432338" class="accordion-body collapse ">
+            <div id="namespace-862350253" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1657890251"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-639686858"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1657890251" class="accordion-body collapse ">
+            <div id="namespace-639686858" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1360364605"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1463058776"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1360364605" class="accordion-body collapse ">
+            <div id="namespace-1463058776" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-648162995"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1902502830"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-648162995" class="accordion-body collapse ">
+            <div id="namespace-1902502830" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-179433434"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-123758883"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-179433434" class="accordion-body collapse ">
+            <div id="namespace-123758883" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1647757382"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-499386528"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1647757382" class="accordion-body collapse ">
+            <div id="namespace-499386528" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -958,7 +958,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.SendE2E.html b/docs/classes/Threema.MsgApi.Commands.SendE2E.html
index ca5993a..fe87d98 100644
--- a/docs/classes/Threema.MsgApi.Commands.SendE2E.html
+++ b/docs/classes/Threema.MsgApi.Commands.SendE2E.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-649107334"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-490584570"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-649107334" class="accordion-body collapse in">
+            <div id="namespace-490584570" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1110299696"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-994666076"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1110299696" class="accordion-body collapse ">
+            <div id="namespace-994666076" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1555065942"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1442980394"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1555065942" class="accordion-body collapse ">
+            <div id="namespace-1442980394" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1676874490"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1922620115"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1676874490" class="accordion-body collapse ">
+            <div id="namespace-1922620115" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-693349792"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-747290933"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-693349792" class="accordion-body collapse ">
+            <div id="namespace-747290933" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-997562874"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-630684784"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-997562874" class="accordion-body collapse ">
+            <div id="namespace-630684784" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-837041988"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-527237064"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-837041988" class="accordion-body collapse ">
+            <div id="namespace-527237064" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1897657628"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-199045387"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1897657628" class="accordion-body collapse ">
+            <div id="namespace-199045387" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-748071427"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1221804788"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-748071427" class="accordion-body collapse ">
+            <div id="namespace-1221804788" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-312341939"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1783667514"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-312341939" class="accordion-body collapse ">
+            <div id="namespace-1783667514" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-770557384"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-109564307"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-770557384" class="accordion-body collapse ">
+            <div id="namespace-109564307" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-51693569"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-959462536"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-51693569" class="accordion-body collapse ">
+            <div id="namespace-959462536" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-486237849"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-467613958"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-486237849" class="accordion-body collapse ">
+            <div id="namespace-467613958" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1633742212"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-597794483"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1633742212" class="accordion-body collapse ">
+            <div id="namespace-597794483" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -889,7 +889,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.SendSimple.html b/docs/classes/Threema.MsgApi.Commands.SendSimple.html
index 72645c1..4dbd71f 100644
--- a/docs/classes/Threema.MsgApi.Commands.SendSimple.html
+++ b/docs/classes/Threema.MsgApi.Commands.SendSimple.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1682946928"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1884014837"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1682946928" class="accordion-body collapse in">
+            <div id="namespace-1884014837" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-425226837"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-762545729"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-425226837" class="accordion-body collapse ">
+            <div id="namespace-762545729" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-367439407"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-827261565"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-367439407" class="accordion-body collapse ">
+            <div id="namespace-827261565" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-421402328"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1076430489"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-421402328" class="accordion-body collapse ">
+            <div id="namespace-1076430489" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1571799388"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2018093220"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1571799388" class="accordion-body collapse ">
+            <div id="namespace-2018093220" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1890021115"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1496137220"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1890021115" class="accordion-body collapse ">
+            <div id="namespace-1496137220" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-156564596"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2058781384"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-156564596" class="accordion-body collapse ">
+            <div id="namespace-2058781384" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1559407091"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1922155015"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1559407091" class="accordion-body collapse ">
+            <div id="namespace-1922155015" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-127268965"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-734471337"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-127268965" class="accordion-body collapse ">
+            <div id="namespace-734471337" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1548722969"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-668368675"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1548722969" class="accordion-body collapse ">
+            <div id="namespace-668368675" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2130319570"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-647023440"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-2130319570" class="accordion-body collapse ">
+            <div id="namespace-647023440" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1618596740"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2087620271"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1618596740" class="accordion-body collapse ">
+            <div id="namespace-2087620271" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-564696500"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-138066686"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-564696500" class="accordion-body collapse ">
+            <div id="namespace-138066686" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2044655522"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1856262628"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2044655522" class="accordion-body collapse ">
+            <div id="namespace-1856262628" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -830,7 +830,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Commands.UploadFile.html b/docs/classes/Threema.MsgApi.Commands.UploadFile.html
index 95ce7cf..8b75216 100644
--- a/docs/classes/Threema.MsgApi.Commands.UploadFile.html
+++ b/docs/classes/Threema.MsgApi.Commands.UploadFile.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-192925426"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2130749417"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-192925426" class="accordion-body collapse in">
+            <div id="namespace-2130749417" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1158896843"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-258353784"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1158896843" class="accordion-body collapse ">
+            <div id="namespace-258353784" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-413957840"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1760587098"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-413957840" class="accordion-body collapse ">
+            <div id="namespace-1760587098" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1883836230"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1793647434"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1883836230" class="accordion-body collapse ">
+            <div id="namespace-1793647434" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1426885325"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-945460364"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1426885325" class="accordion-body collapse ">
+            <div id="namespace-945460364" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-636143416"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1200529438"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-636143416" class="accordion-body collapse ">
+            <div id="namespace-1200529438" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1814034896"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1310948516"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1814034896" class="accordion-body collapse ">
+            <div id="namespace-1310948516" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1516146228"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-685696949"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1516146228" class="accordion-body collapse ">
+            <div id="namespace-685696949" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-299950476"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1503968062"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-299950476" class="accordion-body collapse ">
+            <div id="namespace-1503968062" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-773579727"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2103788382"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-773579727" class="accordion-body collapse ">
+            <div id="namespace-2103788382" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1299629082"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1310704377"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1299629082" class="accordion-body collapse ">
+            <div id="namespace-1310704377" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1600240834"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2140884583"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1600240834" class="accordion-body collapse ">
+            <div id="namespace-2140884583" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-144275984"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2053382960"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-144275984" class="accordion-body collapse ">
+            <div id="namespace-2053382960" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1024157603"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1437015924"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1024157603" class="accordion-body collapse ">
+            <div id="namespace-1437015924" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -800,7 +800,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Connection.html b/docs/classes/Threema.MsgApi.Connection.html
index 478dd0b..078980a 100644
--- a/docs/classes/Threema.MsgApi.Connection.html
+++ b/docs/classes/Threema.MsgApi.Connection.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1114711944"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1061782401"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1114711944" class="accordion-body collapse in">
+            <div id="namespace-1061782401" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-527295675"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-557783952"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-527295675" class="accordion-body collapse ">
+            <div id="namespace-557783952" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1991217323"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-770736775"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1991217323" class="accordion-body collapse ">
+            <div id="namespace-770736775" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1791483317"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-824541891"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1791483317" class="accordion-body collapse ">
+            <div id="namespace-824541891" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1659047994"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-660108818"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1659047994" class="accordion-body collapse ">
+            <div id="namespace-660108818" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1603119315"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2141780204"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1603119315" class="accordion-body collapse ">
+            <div id="namespace-2141780204" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1622928963"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1901074921"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1622928963" class="accordion-body collapse ">
+            <div id="namespace-1901074921" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2091072527"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-318922646"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-2091072527" class="accordion-body collapse ">
+            <div id="namespace-318922646" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1148223320"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1448254602"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1148223320" class="accordion-body collapse ">
+            <div id="namespace-1448254602" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1268846808"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1250772873"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1268846808" class="accordion-body collapse ">
+            <div id="namespace-1250772873" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2080091843"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1350443096"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-2080091843" class="accordion-body collapse ">
+            <div id="namespace-1350443096" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1707445709"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1032442076"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1707445709" class="accordion-body collapse ">
+            <div id="namespace-1032442076" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-85650071"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1999728507"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-85650071" class="accordion-body collapse ">
+            <div id="namespace-1999728507" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1112387510"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1797560352"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1112387510" class="accordion-body collapse ">
+            <div id="namespace-1797560352" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1289,7 +1289,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.ConnectionSettings.html b/docs/classes/Threema.MsgApi.ConnectionSettings.html
index 32c98de..e6b0485 100644
--- a/docs/classes/Threema.MsgApi.ConnectionSettings.html
+++ b/docs/classes/Threema.MsgApi.ConnectionSettings.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-65060544"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1524870870"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-65060544" class="accordion-body collapse in">
+            <div id="namespace-1524870870" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1645692320"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-770215358"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1645692320" class="accordion-body collapse ">
+            <div id="namespace-770215358" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-417621892"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1794772631"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-417621892" class="accordion-body collapse ">
+            <div id="namespace-1794772631" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-870593333"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1099586945"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-870593333" class="accordion-body collapse ">
+            <div id="namespace-1099586945" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1914733836"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-629244337"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1914733836" class="accordion-body collapse ">
+            <div id="namespace-629244337" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-887680305"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1476454966"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-887680305" class="accordion-body collapse ">
+            <div id="namespace-1476454966" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-244640429"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1353265493"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-244640429" class="accordion-body collapse ">
+            <div id="namespace-1353265493" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1112669554"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1759931779"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1112669554" class="accordion-body collapse ">
+            <div id="namespace-1759931779" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1931472552"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1964950993"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1931472552" class="accordion-body collapse ">
+            <div id="namespace-1964950993" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1346940688"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1726863168"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1346940688" class="accordion-body collapse ">
+            <div id="namespace-1726863168" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1118347454"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1406394582"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1118347454" class="accordion-body collapse ">
+            <div id="namespace-1406394582" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-882897076"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-931350581"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-882897076" class="accordion-body collapse ">
+            <div id="namespace-931350581" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1662150937"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1568976824"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1662150937" class="accordion-body collapse ">
+            <div id="namespace-1568976824" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-947607420"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1328388115"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-947607420" class="accordion-body collapse ">
+            <div id="namespace-1328388115" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -990,7 +990,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Constants.html b/docs/classes/Threema.MsgApi.Constants.html
index dd27a80..0eed5f8 100644
--- a/docs/classes/Threema.MsgApi.Constants.html
+++ b/docs/classes/Threema.MsgApi.Constants.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-778376857"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-973593866"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-778376857" class="accordion-body collapse in">
+            <div id="namespace-973593866" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-979152624"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-917396212"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-979152624" class="accordion-body collapse ">
+            <div id="namespace-917396212" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-803318193"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1488093155"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-803318193" class="accordion-body collapse ">
+            <div id="namespace-1488093155" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-615120377"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1194432922"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-615120377" class="accordion-body collapse ">
+            <div id="namespace-1194432922" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1741757664"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1655862390"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1741757664" class="accordion-body collapse ">
+            <div id="namespace-1655862390" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1611167680"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1808015946"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1611167680" class="accordion-body collapse ">
+            <div id="namespace-1808015946" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2043641822"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-909100677"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-2043641822" class="accordion-body collapse ">
+            <div id="namespace-909100677" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-69624871"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-585803720"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-69624871" class="accordion-body collapse ">
+            <div id="namespace-585803720" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-782284763"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1406571729"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-782284763" class="accordion-body collapse ">
+            <div id="namespace-1406571729" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-120352713"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1902349217"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-120352713" class="accordion-body collapse ">
+            <div id="namespace-1902349217" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1324802043"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-380324010"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1324802043" class="accordion-body collapse ">
+            <div id="namespace-380324010" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1553026861"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1209283540"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1553026861" class="accordion-body collapse ">
+            <div id="namespace-1209283540" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1342448100"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-438328333"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1342448100" class="accordion-body collapse ">
+            <div id="namespace-438328333" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1755448351"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-218976286"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1755448351" class="accordion-body collapse ">
+            <div id="namespace-218976286" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -681,7 +681,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Exceptions.BadMessageException.html b/docs/classes/Threema.MsgApi.Exceptions.BadMessageException.html
index bafaaaf..35de45d 100644
--- a/docs/classes/Threema.MsgApi.Exceptions.BadMessageException.html
+++ b/docs/classes/Threema.MsgApi.Exceptions.BadMessageException.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-783372797"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-825204568"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-783372797" class="accordion-body collapse in">
+            <div id="namespace-825204568" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2089046595"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-898474261"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-2089046595" class="accordion-body collapse ">
+            <div id="namespace-898474261" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-873469392"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1160818425"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-873469392" class="accordion-body collapse ">
+            <div id="namespace-1160818425" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-210314159"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1511017816"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-210314159" class="accordion-body collapse ">
+            <div id="namespace-1511017816" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-372114305"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1160111065"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-372114305" class="accordion-body collapse ">
+            <div id="namespace-1160111065" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1217240561"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-477920175"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1217240561" class="accordion-body collapse ">
+            <div id="namespace-477920175" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1097131189"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1670343280"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1097131189" class="accordion-body collapse ">
+            <div id="namespace-1670343280" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-520994933"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2028083638"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-520994933" class="accordion-body collapse ">
+            <div id="namespace-2028083638" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1714587158"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1915375084"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1714587158" class="accordion-body collapse ">
+            <div id="namespace-1915375084" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-72912698"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-559035124"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-72912698" class="accordion-body collapse ">
+            <div id="namespace-559035124" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2043448534"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-940752927"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-2043448534" class="accordion-body collapse ">
+            <div id="namespace-940752927" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-659307549"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1527754180"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-659307549" class="accordion-body collapse ">
+            <div id="namespace-1527754180" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-447463235"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1604722133"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-447463235" class="accordion-body collapse ">
+            <div id="namespace-1604722133" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2110223711"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1926813571"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2110223711" class="accordion-body collapse ">
+            <div id="namespace-1926813571" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -601,7 +601,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Exceptions.DecryptionFailedException.html b/docs/classes/Threema.MsgApi.Exceptions.DecryptionFailedException.html
index 1929752..6cd9540 100644
--- a/docs/classes/Threema.MsgApi.Exceptions.DecryptionFailedException.html
+++ b/docs/classes/Threema.MsgApi.Exceptions.DecryptionFailedException.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1295301366"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1646129884"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1295301366" class="accordion-body collapse in">
+            <div id="namespace-1646129884" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1769430359"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1892999550"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1769430359" class="accordion-body collapse ">
+            <div id="namespace-1892999550" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1629604477"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-837203201"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1629604477" class="accordion-body collapse ">
+            <div id="namespace-837203201" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-850627219"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1400897243"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-850627219" class="accordion-body collapse ">
+            <div id="namespace-1400897243" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-814653891"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-727955279"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-814653891" class="accordion-body collapse ">
+            <div id="namespace-727955279" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1137039898"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1233480061"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1137039898" class="accordion-body collapse ">
+            <div id="namespace-1233480061" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-683226117"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-137181657"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-683226117" class="accordion-body collapse ">
+            <div id="namespace-137181657" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-626416498"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2084267277"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-626416498" class="accordion-body collapse ">
+            <div id="namespace-2084267277" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1937486529"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2057341469"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1937486529" class="accordion-body collapse ">
+            <div id="namespace-2057341469" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1032109811"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1217616104"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1032109811" class="accordion-body collapse ">
+            <div id="namespace-1217616104" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1674396846"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1301622473"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1674396846" class="accordion-body collapse ">
+            <div id="namespace-1301622473" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-4984492"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1435213677"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-4984492" class="accordion-body collapse ">
+            <div id="namespace-1435213677" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1537799630"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1657492931"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1537799630" class="accordion-body collapse ">
+            <div id="namespace-1657492931" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-430228523"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1377558426"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-430228523" class="accordion-body collapse ">
+            <div id="namespace-1377558426" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -601,7 +601,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Exceptions.InvalidArgumentException.html b/docs/classes/Threema.MsgApi.Exceptions.InvalidArgumentException.html
index b284727..d037bc8 100644
--- a/docs/classes/Threema.MsgApi.Exceptions.InvalidArgumentException.html
+++ b/docs/classes/Threema.MsgApi.Exceptions.InvalidArgumentException.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1061820231"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-935208243"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1061820231" class="accordion-body collapse in">
+            <div id="namespace-935208243" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1247887801"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-408380805"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1247887801" class="accordion-body collapse ">
+            <div id="namespace-408380805" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1717536586"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1839160875"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1717536586" class="accordion-body collapse ">
+            <div id="namespace-1839160875" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1084200825"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2144837047"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1084200825" class="accordion-body collapse ">
+            <div id="namespace-2144837047" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1261925974"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-596839464"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1261925974" class="accordion-body collapse ">
+            <div id="namespace-596839464" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-976185796"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2003602819"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-976185796" class="accordion-body collapse ">
+            <div id="namespace-2003602819" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-829821962"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2132877762"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-829821962" class="accordion-body collapse ">
+            <div id="namespace-2132877762" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-547175068"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2076245871"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-547175068" class="accordion-body collapse ">
+            <div id="namespace-2076245871" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1181004973"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1183516340"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1181004973" class="accordion-body collapse ">
+            <div id="namespace-1183516340" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-131306678"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-248429763"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-131306678" class="accordion-body collapse ">
+            <div id="namespace-248429763" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1308315912"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1671607946"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1308315912" class="accordion-body collapse ">
+            <div id="namespace-1671607946" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-96769969"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1416257462"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-96769969" class="accordion-body collapse ">
+            <div id="namespace-1416257462" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1259494381"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1554243421"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1259494381" class="accordion-body collapse ">
+            <div id="namespace-1554243421" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-817914985"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-404292624"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-817914985" class="accordion-body collapse ">
+            <div id="namespace-404292624" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -601,7 +601,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Exceptions.UnsupportedMessageTypeException.html b/docs/classes/Threema.MsgApi.Exceptions.UnsupportedMessageTypeException.html
index 4ddbe8c..67cec0b 100644
--- a/docs/classes/Threema.MsgApi.Exceptions.UnsupportedMessageTypeException.html
+++ b/docs/classes/Threema.MsgApi.Exceptions.UnsupportedMessageTypeException.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-834239603"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-389637496"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-834239603" class="accordion-body collapse in">
+            <div id="namespace-389637496" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-134208329"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-471209788"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-134208329" class="accordion-body collapse ">
+            <div id="namespace-471209788" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-943004742"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1333132441"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-943004742" class="accordion-body collapse ">
+            <div id="namespace-1333132441" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1810214744"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-681674135"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1810214744" class="accordion-body collapse ">
+            <div id="namespace-681674135" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1963729190"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-978650770"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1963729190" class="accordion-body collapse ">
+            <div id="namespace-978650770" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-882544113"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-16413247"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-882544113" class="accordion-body collapse ">
+            <div id="namespace-16413247" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1040555339"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2139785035"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1040555339" class="accordion-body collapse ">
+            <div id="namespace-2139785035" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-856269096"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-292907468"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-856269096" class="accordion-body collapse ">
+            <div id="namespace-292907468" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1290163650"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-606387347"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1290163650" class="accordion-body collapse ">
+            <div id="namespace-606387347" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-837760928"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-911229792"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-837760928" class="accordion-body collapse ">
+            <div id="namespace-911229792" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-838903380"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-285663876"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-838903380" class="accordion-body collapse ">
+            <div id="namespace-285663876" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1814916103"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-608488396"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1814916103" class="accordion-body collapse ">
+            <div id="namespace-608488396" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1027919144"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-683650898"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1027919144" class="accordion-body collapse ">
+            <div id="namespace-683650898" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-3369101"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-745362724"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-3369101" class="accordion-body collapse ">
+            <div id="namespace-745362724" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -601,7 +601,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Helpers.E2EHelper.html b/docs/classes/Threema.MsgApi.Helpers.E2EHelper.html
index 493a13e..5e59bc2 100644
--- a/docs/classes/Threema.MsgApi.Helpers.E2EHelper.html
+++ b/docs/classes/Threema.MsgApi.Helpers.E2EHelper.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1678481587"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2136226159"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1678481587" class="accordion-body collapse in">
+            <div id="namespace-2136226159" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-177671380"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-681786315"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-177671380" class="accordion-body collapse ">
+            <div id="namespace-681786315" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-5243263"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-619534343"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-5243263" class="accordion-body collapse ">
+            <div id="namespace-619534343" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1733541559"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1708456357"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1733541559" class="accordion-body collapse ">
+            <div id="namespace-1708456357" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1707378026"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-341053820"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1707378026" class="accordion-body collapse ">
+            <div id="namespace-341053820" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-473730956"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1850985151"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-473730956" class="accordion-body collapse ">
+            <div id="namespace-1850985151" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-754337177"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-735246394"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-754337177" class="accordion-body collapse ">
+            <div id="namespace-735246394" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-549453527"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1973162868"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-549453527" class="accordion-body collapse ">
+            <div id="namespace-1973162868" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2131656005"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-494712653"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-2131656005" class="accordion-body collapse ">
+            <div id="namespace-494712653" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1079909750"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1603160447"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1079909750" class="accordion-body collapse ">
+            <div id="namespace-1603160447" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1686275656"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1048499409"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1686275656" class="accordion-body collapse ">
+            <div id="namespace-1048499409" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-884088357"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1213327721"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-884088357" class="accordion-body collapse ">
+            <div id="namespace-1213327721" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1985081847"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-228331578"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1985081847" class="accordion-body collapse ">
+            <div id="namespace-228331578" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-372516014"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1297621182"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-372516014" class="accordion-body collapse ">
+            <div id="namespace-1297621182" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -514,6 +514,7 @@ <h2>Summary</h2>
                         <section class="row-fluid private">
                             <section class="span4">
                                                                     <a href="../classes/Threema.MsgApi.Helpers.E2EHelper.html#method_fetchPublicKeyAndCheckCapability" class="">fetchPublicKeyAndCheckCapability()</a><br />
+                                                                    <a href="../classes/Threema.MsgApi.Helpers.E2EHelper.html#method_downloadFile" class="">downloadFile()</a><br />
                                                             </section>
                             <section class="span4">
                                                                     <a href="../classes/Threema.MsgApi.Helpers.E2EHelper.html#property_connection" class="">$connection</a><br />
@@ -835,7 +836,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">receiveMessage()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">receiveMessage(string  <span class="argument">$threemaId</span>, string  <span class="argument">$messageId</span>, string  <span class="argument">$box</span>, string  <span class="argument">$nonce</span>, string|null  <span class="argument">$outputFolder = null</span>) : \Threema\MsgApi\Helpers\ReceiveMessageResult</pre>
+                <pre class="signature" style="margin-right: 54px;">receiveMessage(string  <span class="argument">$threemaId</span>, string  <span class="argument">$messageId</span>, string  <span class="argument">$box</span>, string  <span class="argument">$nonce</span>, string|null  <span class="argument">$outputFolder = null</span>, \Closure  <span class="argument">$downloadMessage = null</span>) : \Threema\MsgApi\Helpers\ReceiveMessageResult</pre>
                 <p><em>Encrypt a message and download the files of the message to the $outputFolder</em></p>
                 
 
@@ -865,12 +866,23 @@ <h4>Parameters</h4>
                                 <td>string|null</td>
                                 <td>$outputFolder </td>
                                 <td><p>folder for storing the files</p></td>
+                            </tr>
+                                                    <tr>
+                                <td>\Closure</td>
+                                <td>$downloadMessage </td>
+                                <td></td>
                             </tr>
                                             </table>
                 
                                     <h4>Throws</h4>
                     <dl>
                                                     <dt>\Threema\Core\Exception</dt>
+                            <dd></dd>
+                                                    <dt>\Threema\MsgApi\Exceptions\BadMessageException</dt>
+                            <dd></dd>
+                                                    <dt>\Threema\MsgApi\Exceptions\DecryptionFailedException</dt>
+                            <dd></dd>
+                                                    <dt>\Threema\MsgApi\Exceptions\UnsupportedMessageTypeException</dt>
                             <dd></dd>
                                                                     </dl>
                 
@@ -897,7 +909,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="private ">fetchPublicKeyAndCheckCapability()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">fetchPublicKeyAndCheckCapability(string  <span class="argument">$threemaId</span>, callable  <span class="argument">$capabilityCheck = null</span>) : string</pre>
+                <pre class="signature" style="margin-right: 54px;">fetchPublicKeyAndCheckCapability(string  <span class="argument">$threemaId</span>, \Closure  <span class="argument">$capabilityCheck = null</span>) : string</pre>
                 <p><em>Fetch a public key and check the capability of the threemaId</em></p>
                 
 
@@ -909,7 +921,7 @@ <h4>Parameters</h4>
                                 <td></td>
                             </tr>
                                                     <tr>
-                                <td>callable</td>
+                                <td>\Closure</td>
                                 <td>$capabilityCheck </td>
                                 <td></td>
                             </tr>
@@ -939,6 +951,58 @@ <h2>Tags</h2>
         </aside>
     </div>
 
+                                    <div class="row-fluid">
+        <div class="span8 content class">
+            <a id="method_downloadFile" name="method_downloadFile" class="anchor"></a>
+            <article class="method">
+                <h3 class="private ">downloadFile()</h3>
+                <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
+                <pre class="signature" style="margin-right: 54px;">downloadFile(\Threema\MsgApi\Messages\ThreemaMessage  <span class="argument">$message</span>, string  <span class="argument">$blobId</span>, \Closure|null  <span class="argument">$downloadMessage = null</span>) : null|\Threema\MsgApi\Commands\Results\DownloadFileResult</pre>
+                <p><em></em></p>
+                
+
+                                    <h4>Parameters</h4>
+                    <table class="table table-condensed table-hover">
+                                                    <tr>
+                                <td><a href="../classes/Threema.MsgApi.Messages.ThreemaMessage.html">\Threema\MsgApi\Messages\ThreemaMessage</a></td>
+                                <td>$message </td>
+                                <td></td>
+                            </tr>
+                                                    <tr>
+                                <td>string</td>
+                                <td>$blobId </td>
+                                <td><p>blob id as hex</p></td>
+                            </tr>
+                                                    <tr>
+                                <td>\Closure|null</td>
+                                <td>$downloadMessage </td>
+                                <td></td>
+                            </tr>
+                                            </table>
+                
+                                    <h4>Throws</h4>
+                    <dl>
+                                                    <dt>\Threema\Core\Exception</dt>
+                            <dd></dd>
+                                                                    </dl>
+                
+                                    <h4>Returns</h4>
+                    null|<a href="../classes/Threema.MsgApi.Commands.Results.DownloadFileResult.html">\Threema\MsgApi\Commands\Results\DownloadFileResult</a>
+                                    				
+                            </article>
+        </div>
+        <aside class="span4 detailsbar">
+            <h1><i class="icon-arrow-down"></i></h1>
+                                                    <span class="label label-info">final</span>
+                                    <dl>
+                                                                            </dl>
+            <h2>Tags</h2>
+            <table class="table table-condensed">
+                                    <tr><td colspan="2"><em>None found</em></td></tr>
+                            </table>
+        </aside>
+    </div>
+
                                     </div>
     </section>
 
@@ -989,7 +1053,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Helpers.ReceiveMessageResult.html b/docs/classes/Threema.MsgApi.Helpers.ReceiveMessageResult.html
index 3732358..042803a 100644
--- a/docs/classes/Threema.MsgApi.Helpers.ReceiveMessageResult.html
+++ b/docs/classes/Threema.MsgApi.Helpers.ReceiveMessageResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-640955036"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1906080887"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-640955036" class="accordion-body collapse in">
+            <div id="namespace-1906080887" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-83545874"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-823498372"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-83545874" class="accordion-body collapse ">
+            <div id="namespace-823498372" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-978842976"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-787251940"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-978842976" class="accordion-body collapse ">
+            <div id="namespace-787251940" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1628122530"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-709174721"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1628122530" class="accordion-body collapse ">
+            <div id="namespace-709174721" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-947785773"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1382888601"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-947785773" class="accordion-body collapse ">
+            <div id="namespace-1382888601" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-384179622"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1445307738"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-384179622" class="accordion-body collapse ">
+            <div id="namespace-1445307738" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1184157028"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-942480406"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1184157028" class="accordion-body collapse ">
+            <div id="namespace-942480406" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-82680642"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1893792158"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-82680642" class="accordion-body collapse ">
+            <div id="namespace-1893792158" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1229335391"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-708228265"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1229335391" class="accordion-body collapse ">
+            <div id="namespace-708228265" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-368956417"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-118864447"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-368956417" class="accordion-body collapse ">
+            <div id="namespace-118864447" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-976869206"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-41832857"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-976869206" class="accordion-body collapse ">
+            <div id="namespace-41832857" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2017898854"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-856476080"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-2017898854" class="accordion-body collapse ">
+            <div id="namespace-856476080" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1731719733"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-639716400"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1731719733" class="accordion-body collapse ">
+            <div id="namespace-639716400" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-938727662"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1998672874"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-938727662" class="accordion-body collapse ">
+            <div id="namespace-1998672874" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -973,7 +973,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Messages.DeliveryReceipt.html b/docs/classes/Threema.MsgApi.Messages.DeliveryReceipt.html
index 2bcf25b..1f5b4c0 100644
--- a/docs/classes/Threema.MsgApi.Messages.DeliveryReceipt.html
+++ b/docs/classes/Threema.MsgApi.Messages.DeliveryReceipt.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2142392578"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1901805364"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-2142392578" class="accordion-body collapse in">
+            <div id="namespace-1901805364" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-132570049"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1144903836"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-132570049" class="accordion-body collapse ">
+            <div id="namespace-1144903836" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1902648352"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1270599053"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1902648352" class="accordion-body collapse ">
+            <div id="namespace-1270599053" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1546785243"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-432306571"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1546785243" class="accordion-body collapse ">
+            <div id="namespace-432306571" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1234376518"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-446520836"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1234376518" class="accordion-body collapse ">
+            <div id="namespace-446520836" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-54240120"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-142954887"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-54240120" class="accordion-body collapse ">
+            <div id="namespace-142954887" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1545395349"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1063309947"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1545395349" class="accordion-body collapse ">
+            <div id="namespace-1063309947" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1963259461"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-134249203"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1963259461" class="accordion-body collapse ">
+            <div id="namespace-134249203" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-600435803"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-673290316"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-600435803" class="accordion-body collapse ">
+            <div id="namespace-673290316" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1173114051"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1426660683"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1173114051" class="accordion-body collapse ">
+            <div id="namespace-1426660683" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1424509587"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1888632409"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1424509587" class="accordion-body collapse ">
+            <div id="namespace-1888632409" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1143096497"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1926021619"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1143096497" class="accordion-body collapse ">
+            <div id="namespace-1926021619" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-787222839"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-727086039"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-787222839" class="accordion-body collapse ">
+            <div id="namespace-727086039" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-67521365"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-615528791"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-67521365" class="accordion-body collapse ">
+            <div id="namespace-615528791" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -902,7 +902,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Messages.FileMessage.html b/docs/classes/Threema.MsgApi.Messages.FileMessage.html
index 7845c5e..9fb7796 100644
--- a/docs/classes/Threema.MsgApi.Messages.FileMessage.html
+++ b/docs/classes/Threema.MsgApi.Messages.FileMessage.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-161921944"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1059594245"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-161921944" class="accordion-body collapse in">
+            <div id="namespace-1059594245" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1166210129"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2050987264"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1166210129" class="accordion-body collapse ">
+            <div id="namespace-2050987264" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-337666576"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2074224951"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-337666576" class="accordion-body collapse ">
+            <div id="namespace-2074224951" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1248454889"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-341003581"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1248454889" class="accordion-body collapse ">
+            <div id="namespace-341003581" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-896055095"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-288961460"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-896055095" class="accordion-body collapse ">
+            <div id="namespace-288961460" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2016708329"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1082710895"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-2016708329" class="accordion-body collapse ">
+            <div id="namespace-1082710895" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-518275662"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2019791763"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-518275662" class="accordion-body collapse ">
+            <div id="namespace-2019791763" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1531777025"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-826673719"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1531777025" class="accordion-body collapse ">
+            <div id="namespace-826673719" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-990479207"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-982387161"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-990479207" class="accordion-body collapse ">
+            <div id="namespace-982387161" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1802337851"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2084176228"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1802337851" class="accordion-body collapse ">
+            <div id="namespace-2084176228" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1086012576"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1298073977"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1086012576" class="accordion-body collapse ">
+            <div id="namespace-1298073977" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-37053466"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-891411637"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-37053466" class="accordion-body collapse ">
+            <div id="namespace-891411637" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1895610221"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-800364820"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1895610221" class="accordion-body collapse ">
+            <div id="namespace-800364820" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-635457837"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1360764706"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-635457837" class="accordion-body collapse ">
+            <div id="namespace-1360764706" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1084,7 +1084,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Messages.ImageMessage.html b/docs/classes/Threema.MsgApi.Messages.ImageMessage.html
index dae0d33..3c30a6a 100644
--- a/docs/classes/Threema.MsgApi.Messages.ImageMessage.html
+++ b/docs/classes/Threema.MsgApi.Messages.ImageMessage.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1697306101"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-518067232"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1697306101" class="accordion-body collapse in">
+            <div id="namespace-518067232" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-706538271"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-971801995"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-706538271" class="accordion-body collapse ">
+            <div id="namespace-971801995" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1434990784"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-919149617"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1434990784" class="accordion-body collapse ">
+            <div id="namespace-919149617" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1013499839"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-941294959"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1013499839" class="accordion-body collapse ">
+            <div id="namespace-941294959" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-698391045"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1268446931"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-698391045" class="accordion-body collapse ">
+            <div id="namespace-1268446931" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1661425549"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1967110265"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1661425549" class="accordion-body collapse ">
+            <div id="namespace-1967110265" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1100687704"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-615527752"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1100687704" class="accordion-body collapse ">
+            <div id="namespace-615527752" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2035199639"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1881840340"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-2035199639" class="accordion-body collapse ">
+            <div id="namespace-1881840340" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-823197856"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1076057596"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-823197856" class="accordion-body collapse ">
+            <div id="namespace-1076057596" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1190691097"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1908348962"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1190691097" class="accordion-body collapse ">
+            <div id="namespace-1908348962" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1180042466"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-705822950"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1180042466" class="accordion-body collapse ">
+            <div id="namespace-705822950" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-602962541"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1369389109"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-602962541" class="accordion-body collapse ">
+            <div id="namespace-1369389109" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1765741145"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-433271872"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1765741145" class="accordion-body collapse ">
+            <div id="namespace-433271872" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-71794886"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-958833972"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-71794886" class="accordion-body collapse ">
+            <div id="namespace-958833972" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -907,7 +907,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Messages.TextMessage.html b/docs/classes/Threema.MsgApi.Messages.TextMessage.html
index 34eb04c..5cece55 100644
--- a/docs/classes/Threema.MsgApi.Messages.TextMessage.html
+++ b/docs/classes/Threema.MsgApi.Messages.TextMessage.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1713125892"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1354360614"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1713125892" class="accordion-body collapse in">
+            <div id="namespace-1354360614" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1625473659"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1889561339"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1625473659" class="accordion-body collapse ">
+            <div id="namespace-1889561339" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-484236167"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-15343213"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-484236167" class="accordion-body collapse ">
+            <div id="namespace-15343213" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1105638115"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1720917264"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1105638115" class="accordion-body collapse ">
+            <div id="namespace-1720917264" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1888103079"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1682142398"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1888103079" class="accordion-body collapse ">
+            <div id="namespace-1682142398" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-995175776"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-71857962"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-995175776" class="accordion-body collapse ">
+            <div id="namespace-71857962" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-64906090"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1680343144"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-64906090" class="accordion-body collapse ">
+            <div id="namespace-1680343144" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-123139423"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1194164101"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-123139423" class="accordion-body collapse ">
+            <div id="namespace-1194164101" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-651051016"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-931615213"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-651051016" class="accordion-body collapse ">
+            <div id="namespace-931615213" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1977623121"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1878250806"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1977623121" class="accordion-body collapse ">
+            <div id="namespace-1878250806" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-268083639"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1947503981"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-268083639" class="accordion-body collapse ">
+            <div id="namespace-1947503981" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1572272435"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1531977475"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1572272435" class="accordion-body collapse ">
+            <div id="namespace-1531977475" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1116930742"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-428714613"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1116930742" class="accordion-body collapse ">
+            <div id="namespace-428714613" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2111679783"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-34847856"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2111679783" class="accordion-body collapse ">
+            <div id="namespace-34847856" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -789,7 +789,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Messages.ThreemaMessage.html b/docs/classes/Threema.MsgApi.Messages.ThreemaMessage.html
index aec1a6b..5643191 100644
--- a/docs/classes/Threema.MsgApi.Messages.ThreemaMessage.html
+++ b/docs/classes/Threema.MsgApi.Messages.ThreemaMessage.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-963242956"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-43622100"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-963242956" class="accordion-body collapse in">
+            <div id="namespace-43622100" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-446635795"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-393718351"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-446635795" class="accordion-body collapse ">
+            <div id="namespace-393718351" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-965841665"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1574006233"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-965841665" class="accordion-body collapse ">
+            <div id="namespace-1574006233" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-798515704"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1025072401"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-798515704" class="accordion-body collapse ">
+            <div id="namespace-1025072401" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1192226698"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1794857889"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1192226698" class="accordion-body collapse ">
+            <div id="namespace-1794857889" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-643799449"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-946728168"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-643799449" class="accordion-body collapse ">
+            <div id="namespace-946728168" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-237388031"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-604446730"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-237388031" class="accordion-body collapse ">
+            <div id="namespace-604446730" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1236496655"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-240292302"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1236496655" class="accordion-body collapse ">
+            <div id="namespace-240292302" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1498266513"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1805210613"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1498266513" class="accordion-body collapse ">
+            <div id="namespace-1805210613" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-75922512"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-296861472"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-75922512" class="accordion-body collapse ">
+            <div id="namespace-296861472" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-828244395"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-877014484"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-828244395" class="accordion-body collapse ">
+            <div id="namespace-877014484" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2129457280"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1629354056"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-2129457280" class="accordion-body collapse ">
+            <div id="namespace-1629354056" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-199229530"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1905606618"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-199229530" class="accordion-body collapse ">
+            <div id="namespace-1905606618" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1058531286"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1167292516"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1058531286" class="accordion-body collapse ">
+            <div id="namespace-1167292516" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -634,7 +634,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.PublicKeyStore.html b/docs/classes/Threema.MsgApi.PublicKeyStore.html
index edf0f9b..922d4b9 100644
--- a/docs/classes/Threema.MsgApi.PublicKeyStore.html
+++ b/docs/classes/Threema.MsgApi.PublicKeyStore.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-512154735"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-449756478"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-512154735" class="accordion-body collapse in">
+            <div id="namespace-449756478" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-14173988"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-665144534"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-14173988" class="accordion-body collapse ">
+            <div id="namespace-665144534" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1835875555"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1925843246"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1835875555" class="accordion-body collapse ">
+            <div id="namespace-1925843246" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2095834930"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-562073828"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-2095834930" class="accordion-body collapse ">
+            <div id="namespace-562073828" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-599892111"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-214650083"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-599892111" class="accordion-body collapse ">
+            <div id="namespace-214650083" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1607940503"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1459639562"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1607940503" class="accordion-body collapse ">
+            <div id="namespace-1459639562" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1361618147"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1799330098"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1361618147" class="accordion-body collapse ">
+            <div id="namespace-1799330098" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-531195138"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1704226321"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-531195138" class="accordion-body collapse ">
+            <div id="namespace-1704226321" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-164658860"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1630773732"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-164658860" class="accordion-body collapse ">
+            <div id="namespace-1630773732" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-403924896"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1875595071"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-403924896" class="accordion-body collapse ">
+            <div id="namespace-1875595071" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1344681853"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-941910823"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1344681853" class="accordion-body collapse ">
+            <div id="namespace-941910823" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-919453280"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-658229346"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-919453280" class="accordion-body collapse ">
+            <div id="namespace-658229346" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1183509197"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-707657727"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1183509197" class="accordion-body collapse ">
+            <div id="namespace-707657727" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-331936595"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-368593656"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-331936595" class="accordion-body collapse ">
+            <div id="namespace-368593656" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -797,7 +797,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.PublicKeyStores.File.html b/docs/classes/Threema.MsgApi.PublicKeyStores.File.html
index 95d2b2d..76b5bf9 100644
--- a/docs/classes/Threema.MsgApi.PublicKeyStores.File.html
+++ b/docs/classes/Threema.MsgApi.PublicKeyStores.File.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1086433510"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-877805178"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1086433510" class="accordion-body collapse in">
+            <div id="namespace-877805178" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1190155619"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1379174773"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1190155619" class="accordion-body collapse ">
+            <div id="namespace-1379174773" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-33937631"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1712474431"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-33937631" class="accordion-body collapse ">
+            <div id="namespace-1712474431" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-223546524"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-770724092"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-223546524" class="accordion-body collapse ">
+            <div id="namespace-770724092" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-8679542"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-59369938"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-8679542" class="accordion-body collapse ">
+            <div id="namespace-59369938" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1873152257"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-890481898"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1873152257" class="accordion-body collapse ">
+            <div id="namespace-890481898" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-180599151"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1061161152"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-180599151" class="accordion-body collapse ">
+            <div id="namespace-1061161152" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-880717547"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-50181878"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-880717547" class="accordion-body collapse ">
+            <div id="namespace-50181878" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1790724438"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-5143242"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1790724438" class="accordion-body collapse ">
+            <div id="namespace-5143242" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1164626973"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-325071321"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1164626973" class="accordion-body collapse ">
+            <div id="namespace-325071321" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2050657762"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1057955625"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-2050657762" class="accordion-body collapse ">
+            <div id="namespace-1057955625" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-211957923"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-866974531"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-211957923" class="accordion-body collapse ">
+            <div id="namespace-866974531" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1946261599"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1040873554"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1946261599" class="accordion-body collapse ">
+            <div id="namespace-1040873554" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-365983775"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1935551639"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-365983775" class="accordion-body collapse ">
+            <div id="namespace-1935551639" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -872,7 +872,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.PublicKeyStores.PhpFile.html b/docs/classes/Threema.MsgApi.PublicKeyStores.PhpFile.html
index 27908cb..7743758 100644
--- a/docs/classes/Threema.MsgApi.PublicKeyStores.PhpFile.html
+++ b/docs/classes/Threema.MsgApi.PublicKeyStores.PhpFile.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-754640511"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-521611449"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-754640511" class="accordion-body collapse in">
+            <div id="namespace-521611449" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-58415380"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1471276807"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-58415380" class="accordion-body collapse ">
+            <div id="namespace-1471276807" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1466543317"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-826336592"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1466543317" class="accordion-body collapse ">
+            <div id="namespace-826336592" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-207858163"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1201787857"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-207858163" class="accordion-body collapse ">
+            <div id="namespace-1201787857" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1522484577"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1515025888"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1522484577" class="accordion-body collapse ">
+            <div id="namespace-1515025888" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2037945951"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-322640521"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-2037945951" class="accordion-body collapse ">
+            <div id="namespace-322640521" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1179685624"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1572935538"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1179685624" class="accordion-body collapse ">
+            <div id="namespace-1572935538" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-123853596"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-341488674"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-123853596" class="accordion-body collapse ">
+            <div id="namespace-341488674" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1537082158"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-3786355"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1537082158" class="accordion-body collapse ">
+            <div id="namespace-3786355" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1922301176"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1908306151"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1922301176" class="accordion-body collapse ">
+            <div id="namespace-1908306151" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-241366475"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1419713756"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-241366475" class="accordion-body collapse ">
+            <div id="namespace-1419713756" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-955092257"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-640043809"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-955092257" class="accordion-body collapse ">
+            <div id="namespace-640043809" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1344444431"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1424110422"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1344444431" class="accordion-body collapse ">
+            <div id="namespace-1424110422" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-931888348"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2126388739"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-931888348" class="accordion-body collapse ">
+            <div id="namespace-2126388739" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -1001,7 +1001,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Receiver.html b/docs/classes/Threema.MsgApi.Receiver.html
index b28a8d2..82b1caf 100644
--- a/docs/classes/Threema.MsgApi.Receiver.html
+++ b/docs/classes/Threema.MsgApi.Receiver.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1947096177"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1728280285"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1947096177" class="accordion-body collapse in">
+            <div id="namespace-1728280285" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1041510092"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1206064543"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1041510092" class="accordion-body collapse ">
+            <div id="namespace-1206064543" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1948792077"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-532711095"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1948792077" class="accordion-body collapse ">
+            <div id="namespace-532711095" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1034268886"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1337239702"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1034268886" class="accordion-body collapse ">
+            <div id="namespace-1337239702" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-129817667"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1099574942"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-129817667" class="accordion-body collapse ">
+            <div id="namespace-1099574942" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1563638789"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2020182388"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1563638789" class="accordion-body collapse ">
+            <div id="namespace-2020182388" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-82830181"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-10402469"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-82830181" class="accordion-body collapse ">
+            <div id="namespace-10402469" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-752030943"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1119105362"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-752030943" class="accordion-body collapse ">
+            <div id="namespace-1119105362" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1896282370"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-799114337"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1896282370" class="accordion-body collapse ">
+            <div id="namespace-799114337" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-434765165"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1800596805"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-434765165" class="accordion-body collapse ">
+            <div id="namespace-1800596805" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1221913440"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-774511353"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1221913440" class="accordion-body collapse ">
+            <div id="namespace-774511353" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-170108241"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-971074314"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-170108241" class="accordion-body collapse ">
+            <div id="namespace-971074314" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1447124976"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-480423941"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1447124976" class="accordion-body collapse ">
+            <div id="namespace-480423941" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1457250441"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-833888547"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1457250441" class="accordion-body collapse ">
+            <div id="namespace-833888547" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -958,7 +958,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Tests.CommonTests.html b/docs/classes/Threema.MsgApi.Tests.CommonTests.html
index 6b96419..4a784e0 100644
--- a/docs/classes/Threema.MsgApi.Tests.CommonTests.html
+++ b/docs/classes/Threema.MsgApi.Tests.CommonTests.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-610828951"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1167761439"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-610828951" class="accordion-body collapse in">
+            <div id="namespace-1167761439" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1325913929"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-492276708"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1325913929" class="accordion-body collapse ">
+            <div id="namespace-492276708" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1537400591"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-199379688"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1537400591" class="accordion-body collapse ">
+            <div id="namespace-199379688" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-877637647"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1842872463"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-877637647" class="accordion-body collapse ">
+            <div id="namespace-1842872463" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1374280705"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-958631571"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1374280705" class="accordion-body collapse ">
+            <div id="namespace-958631571" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-87997209"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-843931096"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-87997209" class="accordion-body collapse ">
+            <div id="namespace-843931096" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1637026723"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-613217428"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1637026723" class="accordion-body collapse ">
+            <div id="namespace-613217428" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1917496560"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1216057656"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1917496560" class="accordion-body collapse ">
+            <div id="namespace-1216057656" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1069933889"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1996911195"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1069933889" class="accordion-body collapse ">
+            <div id="namespace-1996911195" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1413917183"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1475399448"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1413917183" class="accordion-body collapse ">
+            <div id="namespace-1475399448" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-466217046"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1617507405"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-466217046" class="accordion-body collapse ">
+            <div id="namespace-1617507405" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1801368758"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-755242323"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1801368758" class="accordion-body collapse ">
+            <div id="namespace-755242323" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1483207890"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1798762714"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1483207890" class="accordion-body collapse ">
+            <div id="namespace-1798762714" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1393689130"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-595441409"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1393689130" class="accordion-body collapse ">
+            <div id="namespace-595441409" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -712,7 +712,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Tests.Constants.html b/docs/classes/Threema.MsgApi.Tests.Constants.html
index 32fda71..58657cd 100644
--- a/docs/classes/Threema.MsgApi.Tests.Constants.html
+++ b/docs/classes/Threema.MsgApi.Tests.Constants.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1117480301"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1873684469"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1117480301" class="accordion-body collapse in">
+            <div id="namespace-1873684469" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1144092812"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-294144045"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1144092812" class="accordion-body collapse ">
+            <div id="namespace-294144045" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1106226099"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2038449956"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1106226099" class="accordion-body collapse ">
+            <div id="namespace-2038449956" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-322427493"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1849729433"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-322427493" class="accordion-body collapse ">
+            <div id="namespace-1849729433" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1870370711"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2100425314"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1870370711" class="accordion-body collapse ">
+            <div id="namespace-2100425314" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1666810817"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1597567299"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1666810817" class="accordion-body collapse ">
+            <div id="namespace-1597567299" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-917794452"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1841519046"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-917794452" class="accordion-body collapse ">
+            <div id="namespace-1841519046" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1768062683"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-80904623"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1768062683" class="accordion-body collapse ">
+            <div id="namespace-80904623" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-314896489"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-292232444"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-314896489" class="accordion-body collapse ">
+            <div id="namespace-292232444" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1552484558"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-613168736"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1552484558" class="accordion-body collapse ">
+            <div id="namespace-613168736" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2066200306"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1444453662"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-2066200306" class="accordion-body collapse ">
+            <div id="namespace-1444453662" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-599790001"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1531858838"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-599790001" class="accordion-body collapse ">
+            <div id="namespace-1531858838" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1882675364"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1510763928"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1882675364" class="accordion-body collapse ">
+            <div id="namespace-1510763928" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1201030148"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1968577881"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1201030148" class="accordion-body collapse ">
+            <div id="namespace-1968577881" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -781,7 +781,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Tests.CryptToolTests.html b/docs/classes/Threema.MsgApi.Tests.CryptToolTests.html
index 2b19161..acff7d2 100644
--- a/docs/classes/Threema.MsgApi.Tests.CryptToolTests.html
+++ b/docs/classes/Threema.MsgApi.Tests.CryptToolTests.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2044685847"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-98188067"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-2044685847" class="accordion-body collapse in">
+            <div id="namespace-98188067" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1533208046"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-256957934"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1533208046" class="accordion-body collapse ">
+            <div id="namespace-256957934" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-960798281"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-674720975"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-960798281" class="accordion-body collapse ">
+            <div id="namespace-674720975" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-539448302"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-214215256"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-539448302" class="accordion-body collapse ">
+            <div id="namespace-214215256" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-179540278"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-160035549"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-179540278" class="accordion-body collapse ">
+            <div id="namespace-160035549" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-787921356"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-506819990"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-787921356" class="accordion-body collapse ">
+            <div id="namespace-506819990" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-975227314"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1430375247"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-975227314" class="accordion-body collapse ">
+            <div id="namespace-1430375247" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1048754715"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-623774067"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1048754715" class="accordion-body collapse ">
+            <div id="namespace-623774067" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1046956287"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-132103592"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1046956287" class="accordion-body collapse ">
+            <div id="namespace-132103592" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1982927867"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1800604953"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1982927867" class="accordion-body collapse ">
+            <div id="namespace-1800604953" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1431736326"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-912158996"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1431736326" class="accordion-body collapse ">
+            <div id="namespace-912158996" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1970172556"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-425885157"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1970172556" class="accordion-body collapse ">
+            <div id="namespace-425885157" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-54847510"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1364311159"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-54847510" class="accordion-body collapse ">
+            <div id="namespace-1364311159" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1207882382"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1330584737"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1207882382" class="accordion-body collapse ">
+            <div id="namespace-1330584737" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -800,7 +800,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Tools.CryptTool.html b/docs/classes/Threema.MsgApi.Tools.CryptTool.html
index a23170a..bd4151d 100644
--- a/docs/classes/Threema.MsgApi.Tools.CryptTool.html
+++ b/docs/classes/Threema.MsgApi.Tools.CryptTool.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-651769699"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1384856875"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-651769699" class="accordion-body collapse in">
+            <div id="namespace-1384856875" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1392203283"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1107009115"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1392203283" class="accordion-body collapse ">
+            <div id="namespace-1107009115" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2122286242"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1416622148"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-2122286242" class="accordion-body collapse ">
+            <div id="namespace-1416622148" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-465777745"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-138234560"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-465777745" class="accordion-body collapse ">
+            <div id="namespace-138234560" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-146374425"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-866166037"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-146374425" class="accordion-body collapse ">
+            <div id="namespace-866166037" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2106525141"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-927450706"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-2106525141" class="accordion-body collapse ">
+            <div id="namespace-927450706" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1370919614"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-453055733"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1370919614" class="accordion-body collapse ">
+            <div id="namespace-453055733" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-333478429"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-388712659"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-333478429" class="accordion-body collapse ">
+            <div id="namespace-388712659" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-164916832"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1717698994"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-164916832" class="accordion-body collapse ">
+            <div id="namespace-1717698994" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-90334762"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1563952754"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-90334762" class="accordion-body collapse ">
+            <div id="namespace-1563952754" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1625386234"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-761925606"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1625386234" class="accordion-body collapse ">
+            <div id="namespace-761925606" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-658457877"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-980633109"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-658457877" class="accordion-body collapse ">
+            <div id="namespace-980633109" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1285805965"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1333075284"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1285805965" class="accordion-body collapse ">
+            <div id="namespace-1333075284" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-445311445"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-379235291"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-445311445" class="accordion-body collapse ">
+            <div id="namespace-379235291" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -2066,7 +2066,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Tools.CryptToolSalt.html b/docs/classes/Threema.MsgApi.Tools.CryptToolSalt.html
index cd7aa8c..1694a57 100644
--- a/docs/classes/Threema.MsgApi.Tools.CryptToolSalt.html
+++ b/docs/classes/Threema.MsgApi.Tools.CryptToolSalt.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-845909292"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-34168341"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-845909292" class="accordion-body collapse in">
+            <div id="namespace-34168341" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-561864807"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1902906019"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-561864807" class="accordion-body collapse ">
+            <div id="namespace-1902906019" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-891980439"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-962865890"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-891980439" class="accordion-body collapse ">
+            <div id="namespace-962865890" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1592246117"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1788401142"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1592246117" class="accordion-body collapse ">
+            <div id="namespace-1788401142" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1709872413"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-834284140"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1709872413" class="accordion-body collapse ">
+            <div id="namespace-834284140" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1574231174"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-138002780"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1574231174" class="accordion-body collapse ">
+            <div id="namespace-138002780" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1784180564"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-387096978"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1784180564" class="accordion-body collapse ">
+            <div id="namespace-387096978" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-97456213"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-343003565"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-97456213" class="accordion-body collapse ">
+            <div id="namespace-343003565" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2092963380"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-433673718"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-2092963380" class="accordion-body collapse ">
+            <div id="namespace-433673718" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1408030430"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-329238660"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1408030430" class="accordion-body collapse ">
+            <div id="namespace-329238660" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-80320861"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1475039378"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-80320861" class="accordion-body collapse ">
+            <div id="namespace-1475039378" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-783442303"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-862202027"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-783442303" class="accordion-body collapse ">
+            <div id="namespace-862202027" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1861639490"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1994765214"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1861639490" class="accordion-body collapse ">
+            <div id="namespace-1994765214" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1692355998"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1492280977"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1692355998" class="accordion-body collapse ">
+            <div id="namespace-1492280977" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -2170,7 +2170,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Tools.CryptToolSodium.html b/docs/classes/Threema.MsgApi.Tools.CryptToolSodium.html
index 47e9e5e..ec49bb3 100644
--- a/docs/classes/Threema.MsgApi.Tools.CryptToolSodium.html
+++ b/docs/classes/Threema.MsgApi.Tools.CryptToolSodium.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-133240788"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1861375426"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-133240788" class="accordion-body collapse in">
+            <div id="namespace-1861375426" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-630867179"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-895830665"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-630867179" class="accordion-body collapse ">
+            <div id="namespace-895830665" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-494353092"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-228854621"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-494353092" class="accordion-body collapse ">
+            <div id="namespace-228854621" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2036542398"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-752575171"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-2036542398" class="accordion-body collapse ">
+            <div id="namespace-752575171" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1556662077"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1434814384"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1556662077" class="accordion-body collapse ">
+            <div id="namespace-1434814384" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-679036131"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-41392005"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-679036131" class="accordion-body collapse ">
+            <div id="namespace-41392005" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1611380984"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-584093141"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1611380984" class="accordion-body collapse ">
+            <div id="namespace-584093141" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1792658617"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2051186141"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1792658617" class="accordion-body collapse ">
+            <div id="namespace-2051186141" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-515100981"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-178147240"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-515100981" class="accordion-body collapse ">
+            <div id="namespace-178147240" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1968586861"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2063265912"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1968586861" class="accordion-body collapse ">
+            <div id="namespace-2063265912" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1455156927"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-341604196"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1455156927" class="accordion-body collapse ">
+            <div id="namespace-341604196" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1019710518"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-651462570"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1019710518" class="accordion-body collapse ">
+            <div id="namespace-651462570" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1522046798"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1368606530"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1522046798" class="accordion-body collapse ">
+            <div id="namespace-1368606530" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-683303278"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1781534443"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-683303278" class="accordion-body collapse ">
+            <div id="namespace-1781534443" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -2117,7 +2117,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Tools.CryptToolSodiumDep.html b/docs/classes/Threema.MsgApi.Tools.CryptToolSodiumDep.html
index 5d0d9b2..4c411fb 100644
--- a/docs/classes/Threema.MsgApi.Tools.CryptToolSodiumDep.html
+++ b/docs/classes/Threema.MsgApi.Tools.CryptToolSodiumDep.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-656711221"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1051096887"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-656711221" class="accordion-body collapse in">
+            <div id="namespace-1051096887" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-458531832"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-377149748"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-458531832" class="accordion-body collapse ">
+            <div id="namespace-377149748" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1412253543"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2140077218"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1412253543" class="accordion-body collapse ">
+            <div id="namespace-2140077218" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-5298759"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1506181800"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-5298759" class="accordion-body collapse ">
+            <div id="namespace-1506181800" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1364746452"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-284490631"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1364746452" class="accordion-body collapse ">
+            <div id="namespace-284490631" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1995647738"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-492113934"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1995647738" class="accordion-body collapse ">
+            <div id="namespace-492113934" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-770745154"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1943647237"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-770745154" class="accordion-body collapse ">
+            <div id="namespace-1943647237" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-372192987"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1198269226"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-372192987" class="accordion-body collapse ">
+            <div id="namespace-1198269226" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-487192666"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-122340385"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-487192666" class="accordion-body collapse ">
+            <div id="namespace-122340385" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-148062780"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1152818324"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-148062780" class="accordion-body collapse ">
+            <div id="namespace-1152818324" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1595917882"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-574071063"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1595917882" class="accordion-body collapse ">
+            <div id="namespace-574071063" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1908819139"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1800492608"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1908819139" class="accordion-body collapse ">
+            <div id="namespace-1800492608" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1313461098"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1439816919"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1313461098" class="accordion-body collapse ">
+            <div id="namespace-1439816919" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-342234226"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-69759049"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-342234226" class="accordion-body collapse ">
+            <div id="namespace-69759049" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -2124,7 +2124,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Tools.EncryptResult.html b/docs/classes/Threema.MsgApi.Tools.EncryptResult.html
index 30b0a56..54046f6 100644
--- a/docs/classes/Threema.MsgApi.Tools.EncryptResult.html
+++ b/docs/classes/Threema.MsgApi.Tools.EncryptResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1295267651"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1920614218"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1295267651" class="accordion-body collapse in">
+            <div id="namespace-1920614218" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2098060532"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-683961731"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-2098060532" class="accordion-body collapse ">
+            <div id="namespace-683961731" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-357373751"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1029828876"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-357373751" class="accordion-body collapse ">
+            <div id="namespace-1029828876" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-731520935"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1919982400"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-731520935" class="accordion-body collapse ">
+            <div id="namespace-1919982400" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1312111450"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-627120709"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1312111450" class="accordion-body collapse ">
+            <div id="namespace-627120709" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-823377483"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-494151006"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-823377483" class="accordion-body collapse ">
+            <div id="namespace-494151006" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-70453269"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1783480072"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-70453269" class="accordion-body collapse ">
+            <div id="namespace-1783480072" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-729197506"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-872672924"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-729197506" class="accordion-body collapse ">
+            <div id="namespace-872672924" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1986518437"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1737587024"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1986518437" class="accordion-body collapse ">
+            <div id="namespace-1737587024" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1464546495"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1386541172"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1464546495" class="accordion-body collapse ">
+            <div id="namespace-1386541172" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1155313581"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1153405555"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1155313581" class="accordion-body collapse ">
+            <div id="namespace-1153405555" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1216515781"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-819419883"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1216515781" class="accordion-body collapse ">
+            <div id="namespace-819419883" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1149967870"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1273268795"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1149967870" class="accordion-body collapse ">
+            <div id="namespace-1273268795" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1111984976"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1178336437"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1111984976" class="accordion-body collapse ">
+            <div id="namespace-1178336437" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -878,7 +878,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Tools.FileAnalysisResult.html b/docs/classes/Threema.MsgApi.Tools.FileAnalysisResult.html
index 9c93783..458f999 100644
--- a/docs/classes/Threema.MsgApi.Tools.FileAnalysisResult.html
+++ b/docs/classes/Threema.MsgApi.Tools.FileAnalysisResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-6580079"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1967438784"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-6580079" class="accordion-body collapse in">
+            <div id="namespace-1967438784" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-922259896"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-506658465"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-922259896" class="accordion-body collapse ">
+            <div id="namespace-506658465" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-239657076"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1076857473"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-239657076" class="accordion-body collapse ">
+            <div id="namespace-1076857473" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-929197122"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-889469718"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-929197122" class="accordion-body collapse ">
+            <div id="namespace-889469718" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1437673371"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-755408685"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1437673371" class="accordion-body collapse ">
+            <div id="namespace-755408685" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-730101364"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-874118300"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-730101364" class="accordion-body collapse ">
+            <div id="namespace-874118300" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1705546874"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1707785562"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1705546874" class="accordion-body collapse ">
+            <div id="namespace-1707785562" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1100693145"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1376610469"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1100693145" class="accordion-body collapse ">
+            <div id="namespace-1376610469" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1482560527"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1117093521"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1482560527" class="accordion-body collapse ">
+            <div id="namespace-1117093521" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-789079262"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-689363631"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-789079262" class="accordion-body collapse ">
+            <div id="namespace-689363631" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1554999309"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1093289267"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1554999309" class="accordion-body collapse ">
+            <div id="namespace-1093289267" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1073885774"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-137185618"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1073885774" class="accordion-body collapse ">
+            <div id="namespace-137185618" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-413554374"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1874446063"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-413554374" class="accordion-body collapse ">
+            <div id="namespace-1874446063" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2061752015"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1952063520"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2061752015" class="accordion-body collapse ">
+            <div id="namespace-1952063520" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -845,7 +845,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/Threema.MsgApi.Tools.FileAnalysisTool.html b/docs/classes/Threema.MsgApi.Tools.FileAnalysisTool.html
index 5a17da2..da53e99 100644
--- a/docs/classes/Threema.MsgApi.Tools.FileAnalysisTool.html
+++ b/docs/classes/Threema.MsgApi.Tools.FileAnalysisTool.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1818528733"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1868538816"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1818528733" class="accordion-body collapse in">
+            <div id="namespace-1868538816" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-254696687"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-303769147"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-254696687" class="accordion-body collapse ">
+            <div id="namespace-303769147" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1694033122"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1905873489"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1694033122" class="accordion-body collapse ">
+            <div id="namespace-1905873489" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-509483404"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-37145015"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-509483404" class="accordion-body collapse ">
+            <div id="namespace-37145015" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1572934587"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1397298569"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1572934587" class="accordion-body collapse ">
+            <div id="namespace-1397298569" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1814017723"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-338770564"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1814017723" class="accordion-body collapse ">
+            <div id="namespace-338770564" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1959798193"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-972328946"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1959798193" class="accordion-body collapse ">
+            <div id="namespace-972328946" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1050059130"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-143747389"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1050059130" class="accordion-body collapse ">
+            <div id="namespace-143747389" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-724402022"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-584373559"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-724402022" class="accordion-body collapse ">
+            <div id="namespace-584373559" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1118896448"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2067109934"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1118896448" class="accordion-body collapse ">
+            <div id="namespace-2067109934" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-452594791"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1139326640"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-452594791" class="accordion-body collapse ">
+            <div id="namespace-1139326640" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-573521212"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2058148351"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-573521212" class="accordion-body collapse ">
+            <div id="namespace-2058148351" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1333845132"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1151245988"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1333845132" class="accordion-body collapse ">
+            <div id="namespace-1151245988" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1070586029"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1666576368"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1070586029" class="accordion-body collapse ">
+            <div id="namespace-1666576368" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -641,7 +641,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Salt.Curve25519.Curve25519.html b/docs/files/Salt.Curve25519.Curve25519.html
index 0ee0c9e..0a504e8 100644
--- a/docs/files/Salt.Curve25519.Curve25519.html
+++ b/docs/files/Salt.Curve25519.Curve25519.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1010574005"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-799820725"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1010574005" class="accordion-body collapse in">
+            <div id="namespace-799820725" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1636517220"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-441534499"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1636517220" class="accordion-body collapse ">
+            <div id="namespace-441534499" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1906634056"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1553234433"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1906634056" class="accordion-body collapse ">
+            <div id="namespace-1553234433" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-230793785"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-747245152"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-230793785" class="accordion-body collapse ">
+            <div id="namespace-747245152" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1721191170"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1369880193"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1721191170" class="accordion-body collapse ">
+            <div id="namespace-1369880193" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-297918315"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1227011116"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-297918315" class="accordion-body collapse ">
+            <div id="namespace-1227011116" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1889320031"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1769133061"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1889320031" class="accordion-body collapse ">
+            <div id="namespace-1769133061" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-184389929"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1124687403"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-184389929" class="accordion-body collapse ">
+            <div id="namespace-1124687403" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-199393152"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1010432069"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-199393152" class="accordion-body collapse ">
+            <div id="namespace-1010432069" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-271885780"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1765135200"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-271885780" class="accordion-body collapse ">
+            <div id="namespace-1765135200" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-748336286"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1727089846"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-748336286" class="accordion-body collapse ">
+            <div id="namespace-1727089846" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1015287113"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-991315851"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1015287113" class="accordion-body collapse ">
+            <div id="namespace-991315851" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-519175899"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1209363969"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-519175899" class="accordion-body collapse ">
+            <div id="namespace-1209363969" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-500402670"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-796377970"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-500402670" class="accordion-body collapse ">
+            <div id="namespace-796377970" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -548,7 +548,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Salt.FieldElement.html b/docs/files/Salt.FieldElement.html
index d5d5923..e47ad2b 100644
--- a/docs/files/Salt.FieldElement.html
+++ b/docs/files/Salt.FieldElement.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1213408561"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1544527181"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1213408561" class="accordion-body collapse in">
+            <div id="namespace-1544527181" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-871003531"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-680150715"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-871003531" class="accordion-body collapse ">
+            <div id="namespace-680150715" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-115158799"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1805315733"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-115158799" class="accordion-body collapse ">
+            <div id="namespace-1805315733" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-829302072"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-630995198"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-829302072" class="accordion-body collapse ">
+            <div id="namespace-630995198" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1916052406"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2052889906"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1916052406" class="accordion-body collapse ">
+            <div id="namespace-2052889906" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1427413574"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1432589831"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1427413574" class="accordion-body collapse ">
+            <div id="namespace-1432589831" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-866916191"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-706801297"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-866916191" class="accordion-body collapse ">
+            <div id="namespace-706801297" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-794401579"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-69806400"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-794401579" class="accordion-body collapse ">
+            <div id="namespace-69806400" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1092210618"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1047716234"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1092210618" class="accordion-body collapse ">
+            <div id="namespace-1047716234" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-251454145"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-128988469"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-251454145" class="accordion-body collapse ">
+            <div id="namespace-128988469" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-604176364"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1334547313"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-604176364" class="accordion-body collapse ">
+            <div id="namespace-1334547313" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-493368117"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1242645913"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-493368117" class="accordion-body collapse ">
+            <div id="namespace-1242645913" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2078411690"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-959767995"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2078411690" class="accordion-body collapse ">
+            <div id="namespace-959767995" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1730879502"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1502973378"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1730879502" class="accordion-body collapse ">
+            <div id="namespace-1502973378" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -548,7 +548,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Salt.Poly1305.Poly1305.html b/docs/files/Salt.Poly1305.Poly1305.html
index c53f3f9..10fa6a9 100644
--- a/docs/files/Salt.Poly1305.Poly1305.html
+++ b/docs/files/Salt.Poly1305.Poly1305.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-597642698"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-42934953"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-597642698" class="accordion-body collapse in">
+            <div id="namespace-42934953" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-293701089"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-808839498"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-293701089" class="accordion-body collapse ">
+            <div id="namespace-808839498" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-39094038"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-608126747"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-39094038" class="accordion-body collapse ">
+            <div id="namespace-608126747" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1191309227"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1993477338"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1191309227" class="accordion-body collapse ">
+            <div id="namespace-1993477338" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-366044001"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1583198614"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-366044001" class="accordion-body collapse ">
+            <div id="namespace-1583198614" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1098359223"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-429496375"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1098359223" class="accordion-body collapse ">
+            <div id="namespace-429496375" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-807216485"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-77519707"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-807216485" class="accordion-body collapse ">
+            <div id="namespace-77519707" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1532002968"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-292303050"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1532002968" class="accordion-body collapse ">
+            <div id="namespace-292303050" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1181610300"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1670202038"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1181610300" class="accordion-body collapse ">
+            <div id="namespace-1670202038" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-397061213"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1795518564"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-397061213" class="accordion-body collapse ">
+            <div id="namespace-1795518564" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-975786001"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-519431118"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-975786001" class="accordion-body collapse ">
+            <div id="namespace-519431118" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-902514772"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1552831823"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-902514772" class="accordion-body collapse ">
+            <div id="namespace-1552831823" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-672512682"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-916658826"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-672512682" class="accordion-body collapse ">
+            <div id="namespace-916658826" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-239497472"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-845556826"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-239497472" class="accordion-body collapse ">
+            <div id="namespace-845556826" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -548,7 +548,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Salt.Salsa20.Salsa20.html b/docs/files/Salt.Salsa20.Salsa20.html
index 090edac..da8e2bc 100644
--- a/docs/files/Salt.Salsa20.Salsa20.html
+++ b/docs/files/Salt.Salsa20.Salsa20.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-714620350"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-326013287"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-714620350" class="accordion-body collapse in">
+            <div id="namespace-326013287" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-849621976"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1701228840"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-849621976" class="accordion-body collapse ">
+            <div id="namespace-1701228840" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1984127150"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-485391909"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1984127150" class="accordion-body collapse ">
+            <div id="namespace-485391909" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1800455226"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1897094733"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1800455226" class="accordion-body collapse ">
+            <div id="namespace-1897094733" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-578511936"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2100186446"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-578511936" class="accordion-body collapse ">
+            <div id="namespace-2100186446" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1878506390"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1327072107"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1878506390" class="accordion-body collapse ">
+            <div id="namespace-1327072107" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1487598614"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-911482680"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1487598614" class="accordion-body collapse ">
+            <div id="namespace-911482680" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-672822829"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-513488859"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-672822829" class="accordion-body collapse ">
+            <div id="namespace-513488859" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1411835506"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2141048409"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1411835506" class="accordion-body collapse ">
+            <div id="namespace-2141048409" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-779780024"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-196293"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-779780024" class="accordion-body collapse ">
+            <div id="namespace-196293" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-809350152"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-473725527"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-809350152" class="accordion-body collapse ">
+            <div id="namespace-473725527" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-84921655"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1534826395"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-84921655" class="accordion-body collapse ">
+            <div id="namespace-1534826395" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-138563708"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-154448450"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-138563708" class="accordion-body collapse ">
+            <div id="namespace-154448450" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-887924429"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1550084931"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-887924429" class="accordion-body collapse ">
+            <div id="namespace-1550084931" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -548,7 +548,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Salt.Salt.html b/docs/files/Salt.Salt.html
index 7b0c67d..2423251 100644
--- a/docs/files/Salt.Salt.html
+++ b/docs/files/Salt.Salt.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2131098250"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1438272119"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-2131098250" class="accordion-body collapse in">
+            <div id="namespace-1438272119" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-927248337"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-444350518"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-927248337" class="accordion-body collapse ">
+            <div id="namespace-444350518" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1118781540"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1576700000"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1118781540" class="accordion-body collapse ">
+            <div id="namespace-1576700000" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-882353151"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-762313516"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-882353151" class="accordion-body collapse ">
+            <div id="namespace-762313516" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1921289178"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1418590652"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1921289178" class="accordion-body collapse ">
+            <div id="namespace-1418590652" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1116481076"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-858884862"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1116481076" class="accordion-body collapse ">
+            <div id="namespace-858884862" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1405700695"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2000124066"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1405700695" class="accordion-body collapse ">
+            <div id="namespace-2000124066" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-488033161"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-472767211"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-488033161" class="accordion-body collapse ">
+            <div id="namespace-472767211" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-333848223"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-987048212"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-333848223" class="accordion-body collapse ">
+            <div id="namespace-987048212" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1529518913"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1434758690"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1529518913" class="accordion-body collapse ">
+            <div id="namespace-1434758690" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-767042455"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-720981088"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-767042455" class="accordion-body collapse ">
+            <div id="namespace-720981088" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-405661993"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-246801248"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-405661993" class="accordion-body collapse ">
+            <div id="namespace-246801248" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1253842989"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1078959239"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1253842989" class="accordion-body collapse ">
+            <div id="namespace-1078959239" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-638544680"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1187204193"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-638544680" class="accordion-body collapse ">
+            <div id="namespace-1187204193" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -548,7 +548,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Salt.SaltException.html b/docs/files/Salt.SaltException.html
index badf7d8..febcff3 100644
--- a/docs/files/Salt.SaltException.html
+++ b/docs/files/Salt.SaltException.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1903614589"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-188303160"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1903614589" class="accordion-body collapse in">
+            <div id="namespace-188303160" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1310901302"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1311646109"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1310901302" class="accordion-body collapse ">
+            <div id="namespace-1311646109" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-995148374"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-232376616"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-995148374" class="accordion-body collapse ">
+            <div id="namespace-232376616" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-196487962"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1848280980"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-196487962" class="accordion-body collapse ">
+            <div id="namespace-1848280980" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-608762097"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2104348225"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-608762097" class="accordion-body collapse ">
+            <div id="namespace-2104348225" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1936188481"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-196444450"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1936188481" class="accordion-body collapse ">
+            <div id="namespace-196444450" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1959950988"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-781860994"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1959950988" class="accordion-body collapse ">
+            <div id="namespace-781860994" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1866657384"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-152628135"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1866657384" class="accordion-body collapse ">
+            <div id="namespace-152628135" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1067840221"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-566544535"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1067840221" class="accordion-body collapse ">
+            <div id="namespace-566544535" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1473081758"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-196291925"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1473081758" class="accordion-body collapse ">
+            <div id="namespace-196291925" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-792054990"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1608973653"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-792054990" class="accordion-body collapse ">
+            <div id="namespace-1608973653" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1563712939"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-576197292"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1563712939" class="accordion-body collapse ">
+            <div id="namespace-576197292" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-978700958"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1604208612"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-978700958" class="accordion-body collapse ">
+            <div id="namespace-1604208612" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-740878922"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-62810282"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-740878922" class="accordion-body collapse ">
+            <div id="namespace-62810282" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -548,7 +548,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Salt.autoload.html b/docs/files/Salt.autoload.html
index e0d710f..adb7bb9 100644
--- a/docs/files/Salt.autoload.html
+++ b/docs/files/Salt.autoload.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1949628574"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-392042164"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1949628574" class="accordion-body collapse in">
+            <div id="namespace-392042164" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-347941034"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-43297586"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-347941034" class="accordion-body collapse ">
+            <div id="namespace-43297586" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-248624959"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-918292525"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-248624959" class="accordion-body collapse ">
+            <div id="namespace-918292525" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1680748011"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1877721761"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1680748011" class="accordion-body collapse ">
+            <div id="namespace-1877721761" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-615803509"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2004004414"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-615803509" class="accordion-body collapse ">
+            <div id="namespace-2004004414" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-324508616"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1317695771"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-324508616" class="accordion-body collapse ">
+            <div id="namespace-1317695771" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-561956129"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1271797436"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-561956129" class="accordion-body collapse ">
+            <div id="namespace-1271797436" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1377986660"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-470191924"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1377986660" class="accordion-body collapse ">
+            <div id="namespace-470191924" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-270532207"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-227073159"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-270532207" class="accordion-body collapse ">
+            <div id="namespace-227073159" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1673914604"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2050856650"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1673914604" class="accordion-body collapse ">
+            <div id="namespace-2050856650" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1630666594"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-258822002"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1630666594" class="accordion-body collapse ">
+            <div id="namespace-258822002" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-776206588"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1487967982"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-776206588" class="accordion-body collapse ">
+            <div id="namespace-1487967982" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2033267491"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1433472195"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2033267491" class="accordion-body collapse ">
+            <div id="namespace-1433472195" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1901352756"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1209263349"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1901352756" class="accordion-body collapse ">
+            <div id="namespace-1209263349" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -541,7 +541,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.Base.html b/docs/files/Threema.Console.Command.Base.html
index 9be6e95..1b505b0 100644
--- a/docs/files/Threema.Console.Command.Base.html
+++ b/docs/files/Threema.Console.Command.Base.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1572241776"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2111667112"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1572241776" class="accordion-body collapse in">
+            <div id="namespace-2111667112" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-452418490"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-414231060"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-452418490" class="accordion-body collapse ">
+            <div id="namespace-414231060" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-853102505"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1126439035"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-853102505" class="accordion-body collapse ">
+            <div id="namespace-1126439035" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-125517713"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-944581237"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-125517713" class="accordion-body collapse ">
+            <div id="namespace-944581237" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1203063228"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-297357055"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1203063228" class="accordion-body collapse ">
+            <div id="namespace-297357055" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-841365778"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1224826795"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-841365778" class="accordion-body collapse ">
+            <div id="namespace-1224826795" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-375753455"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1139570604"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-375753455" class="accordion-body collapse ">
+            <div id="namespace-1139570604" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-850964882"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1974055462"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-850964882" class="accordion-body collapse ">
+            <div id="namespace-1974055462" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1641437991"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-64553666"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1641437991" class="accordion-body collapse ">
+            <div id="namespace-64553666" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1868780516"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2101434926"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1868780516" class="accordion-body collapse ">
+            <div id="namespace-2101434926" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-556793424"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2076540893"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-556793424" class="accordion-body collapse ">
+            <div id="namespace-2076540893" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1505180833"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-327795036"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1505180833" class="accordion-body collapse ">
+            <div id="namespace-327795036" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1463033635"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-302534754"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1463033635" class="accordion-body collapse ">
+            <div id="namespace-302534754" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1037542663"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1617510013"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1037542663" class="accordion-body collapse ">
+            <div id="namespace-1617510013" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.Capability.html b/docs/files/Threema.Console.Command.Capability.html
index c40021b..4a9185e 100644
--- a/docs/files/Threema.Console.Command.Capability.html
+++ b/docs/files/Threema.Console.Command.Capability.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-604951653"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-199766134"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-604951653" class="accordion-body collapse in">
+            <div id="namespace-199766134" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1799801179"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-855402247"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1799801179" class="accordion-body collapse ">
+            <div id="namespace-855402247" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-978680265"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1139392882"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-978680265" class="accordion-body collapse ">
+            <div id="namespace-1139392882" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-182011907"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1156456039"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-182011907" class="accordion-body collapse ">
+            <div id="namespace-1156456039" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1793212935"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-555509971"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1793212935" class="accordion-body collapse ">
+            <div id="namespace-555509971" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-34743286"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-348536894"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-34743286" class="accordion-body collapse ">
+            <div id="namespace-348536894" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1040253784"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1108626619"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1040253784" class="accordion-body collapse ">
+            <div id="namespace-1108626619" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1795961825"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1403939342"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1795961825" class="accordion-body collapse ">
+            <div id="namespace-1403939342" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-145632610"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-467336023"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-145632610" class="accordion-body collapse ">
+            <div id="namespace-467336023" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-630450848"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1319091468"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-630450848" class="accordion-body collapse ">
+            <div id="namespace-1319091468" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1021045879"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-763773621"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1021045879" class="accordion-body collapse ">
+            <div id="namespace-763773621" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-565096738"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1030177496"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-565096738" class="accordion-body collapse ">
+            <div id="namespace-1030177496" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-359332136"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-815895741"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-359332136" class="accordion-body collapse ">
+            <div id="namespace-815895741" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-630843234"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-401145787"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-630843234" class="accordion-body collapse ">
+            <div id="namespace-401145787" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.Credits.html b/docs/files/Threema.Console.Command.Credits.html
index ac74f3f..15b0eb5 100644
--- a/docs/files/Threema.Console.Command.Credits.html
+++ b/docs/files/Threema.Console.Command.Credits.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-187448195"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-444224967"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-187448195" class="accordion-body collapse in">
+            <div id="namespace-444224967" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1265354968"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-154248637"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1265354968" class="accordion-body collapse ">
+            <div id="namespace-154248637" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-475290171"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2137050574"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-475290171" class="accordion-body collapse ">
+            <div id="namespace-2137050574" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-729442325"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-715638776"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-729442325" class="accordion-body collapse ">
+            <div id="namespace-715638776" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1279684443"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1659017916"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1279684443" class="accordion-body collapse ">
+            <div id="namespace-1659017916" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-564858566"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1154120399"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-564858566" class="accordion-body collapse ">
+            <div id="namespace-1154120399" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-617450703"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1760690255"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-617450703" class="accordion-body collapse ">
+            <div id="namespace-1760690255" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-392545580"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1774341050"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-392545580" class="accordion-body collapse ">
+            <div id="namespace-1774341050" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-975293864"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-593756882"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-975293864" class="accordion-body collapse ">
+            <div id="namespace-593756882" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-263774228"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2129147778"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-263774228" class="accordion-body collapse ">
+            <div id="namespace-2129147778" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1440697876"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1145526051"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1440697876" class="accordion-body collapse ">
+            <div id="namespace-1145526051" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1058372512"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-125844007"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1058372512" class="accordion-body collapse ">
+            <div id="namespace-125844007" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1359338083"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-895546633"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1359338083" class="accordion-body collapse ">
+            <div id="namespace-895546633" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1574127071"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-678589576"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1574127071" class="accordion-body collapse ">
+            <div id="namespace-678589576" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.Decrypt.html b/docs/files/Threema.Console.Command.Decrypt.html
index 2d0829e..9c67491 100644
--- a/docs/files/Threema.Console.Command.Decrypt.html
+++ b/docs/files/Threema.Console.Command.Decrypt.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1235116531"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-535053396"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1235116531" class="accordion-body collapse in">
+            <div id="namespace-535053396" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1174709199"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1428983830"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1174709199" class="accordion-body collapse ">
+            <div id="namespace-1428983830" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-819670634"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1334291049"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-819670634" class="accordion-body collapse ">
+            <div id="namespace-1334291049" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1667984043"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-506709534"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1667984043" class="accordion-body collapse ">
+            <div id="namespace-506709534" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-35514335"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1692525144"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-35514335" class="accordion-body collapse ">
+            <div id="namespace-1692525144" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1636647509"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1981508931"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1636647509" class="accordion-body collapse ">
+            <div id="namespace-1981508931" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1868456910"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1873866866"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1868456910" class="accordion-body collapse ">
+            <div id="namespace-1873866866" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-890478229"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1838970215"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-890478229" class="accordion-body collapse ">
+            <div id="namespace-1838970215" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2093717893"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1207605620"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-2093717893" class="accordion-body collapse ">
+            <div id="namespace-1207605620" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1213425871"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-474907560"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1213425871" class="accordion-body collapse ">
+            <div id="namespace-474907560" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-307147410"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-681416961"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-307147410" class="accordion-body collapse ">
+            <div id="namespace-681416961" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1876761253"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1273978803"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1876761253" class="accordion-body collapse ">
+            <div id="namespace-1273978803" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2081990776"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1335597880"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2081990776" class="accordion-body collapse ">
+            <div id="namespace-1335597880" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1572865225"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1514199635"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1572865225" class="accordion-body collapse ">
+            <div id="namespace-1514199635" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.DerivePublicKey.html b/docs/files/Threema.Console.Command.DerivePublicKey.html
index 640245b..5450eaf 100644
--- a/docs/files/Threema.Console.Command.DerivePublicKey.html
+++ b/docs/files/Threema.Console.Command.DerivePublicKey.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1661129276"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1773790921"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1661129276" class="accordion-body collapse in">
+            <div id="namespace-1773790921" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-903207946"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-28503637"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-903207946" class="accordion-body collapse ">
+            <div id="namespace-28503637" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1676839718"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-997091459"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1676839718" class="accordion-body collapse ">
+            <div id="namespace-997091459" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-409179004"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-453400363"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-409179004" class="accordion-body collapse ">
+            <div id="namespace-453400363" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1529966760"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-725441130"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1529966760" class="accordion-body collapse ">
+            <div id="namespace-725441130" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2098812933"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-140541765"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-2098812933" class="accordion-body collapse ">
+            <div id="namespace-140541765" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1225658798"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2075211434"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1225658798" class="accordion-body collapse ">
+            <div id="namespace-2075211434" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-467849174"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-588325705"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-467849174" class="accordion-body collapse ">
+            <div id="namespace-588325705" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1246336895"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-918480168"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1246336895" class="accordion-body collapse ">
+            <div id="namespace-918480168" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1559891371"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-100949660"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1559891371" class="accordion-body collapse ">
+            <div id="namespace-100949660" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1887378974"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-815029755"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1887378974" class="accordion-body collapse ">
+            <div id="namespace-815029755" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-671753658"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1032914183"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-671753658" class="accordion-body collapse ">
+            <div id="namespace-1032914183" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1599714379"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1834696606"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1599714379" class="accordion-body collapse ">
+            <div id="namespace-1834696606" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1617957935"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-475808244"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1617957935" class="accordion-body collapse ">
+            <div id="namespace-475808244" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.Encrypt.html b/docs/files/Threema.Console.Command.Encrypt.html
index 09ae8fb..3fd083c 100644
--- a/docs/files/Threema.Console.Command.Encrypt.html
+++ b/docs/files/Threema.Console.Command.Encrypt.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1045341861"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-264955786"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1045341861" class="accordion-body collapse in">
+            <div id="namespace-264955786" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-796160777"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-271060934"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-796160777" class="accordion-body collapse ">
+            <div id="namespace-271060934" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1019541762"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1945077450"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1019541762" class="accordion-body collapse ">
+            <div id="namespace-1945077450" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2103795387"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-406930456"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-2103795387" class="accordion-body collapse ">
+            <div id="namespace-406930456" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-321167808"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-44171017"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-321167808" class="accordion-body collapse ">
+            <div id="namespace-44171017" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-644560999"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2116483671"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-644560999" class="accordion-body collapse ">
+            <div id="namespace-2116483671" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-810472440"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-574232496"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-810472440" class="accordion-body collapse ">
+            <div id="namespace-574232496" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1944834724"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1627899898"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1944834724" class="accordion-body collapse ">
+            <div id="namespace-1627899898" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-535792621"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-544643136"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-535792621" class="accordion-body collapse ">
+            <div id="namespace-544643136" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1346226614"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-270902148"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1346226614" class="accordion-body collapse ">
+            <div id="namespace-270902148" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-750783319"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1009779060"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-750783319" class="accordion-body collapse ">
+            <div id="namespace-1009779060" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-43188648"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-372951807"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-43188648" class="accordion-body collapse ">
+            <div id="namespace-372951807" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-937812080"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1758138092"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-937812080" class="accordion-body collapse ">
+            <div id="namespace-1758138092" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1336046479"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-645402682"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1336046479" class="accordion-body collapse ">
+            <div id="namespace-645402682" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.GenerateKeyPair.html b/docs/files/Threema.Console.Command.GenerateKeyPair.html
index a499943..ed0587d 100644
--- a/docs/files/Threema.Console.Command.GenerateKeyPair.html
+++ b/docs/files/Threema.Console.Command.GenerateKeyPair.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-722143977"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-588560753"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-722143977" class="accordion-body collapse in">
+            <div id="namespace-588560753" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2022543409"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1948682052"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-2022543409" class="accordion-body collapse ">
+            <div id="namespace-1948682052" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2080988590"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1995593728"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-2080988590" class="accordion-body collapse ">
+            <div id="namespace-1995593728" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-659571481"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1575286773"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-659571481" class="accordion-body collapse ">
+            <div id="namespace-1575286773" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-499464366"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-117388286"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-499464366" class="accordion-body collapse ">
+            <div id="namespace-117388286" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-393880194"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-559192654"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-393880194" class="accordion-body collapse ">
+            <div id="namespace-559192654" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2116373141"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-810149590"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-2116373141" class="accordion-body collapse ">
+            <div id="namespace-810149590" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-639828638"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-909289220"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-639828638" class="accordion-body collapse ">
+            <div id="namespace-909289220" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-886618786"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1085720221"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-886618786" class="accordion-body collapse ">
+            <div id="namespace-1085720221" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-691224036"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1635069506"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-691224036" class="accordion-body collapse ">
+            <div id="namespace-1635069506" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-705808952"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1979209146"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-705808952" class="accordion-body collapse ">
+            <div id="namespace-1979209146" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2098955154"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2016762878"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-2098955154" class="accordion-body collapse ">
+            <div id="namespace-2016762878" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2129773826"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-796767129"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2129773826" class="accordion-body collapse ">
+            <div id="namespace-796767129" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-500872812"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1791285834"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-500872812" class="accordion-body collapse ">
+            <div id="namespace-1791285834" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.HashEmail.html b/docs/files/Threema.Console.Command.HashEmail.html
index 16641da..89fa8bb 100644
--- a/docs/files/Threema.Console.Command.HashEmail.html
+++ b/docs/files/Threema.Console.Command.HashEmail.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-652290211"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1479856055"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-652290211" class="accordion-body collapse in">
+            <div id="namespace-1479856055" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1126596865"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1363594640"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1126596865" class="accordion-body collapse ">
+            <div id="namespace-1363594640" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1702405466"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-430815452"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1702405466" class="accordion-body collapse ">
+            <div id="namespace-430815452" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-535462243"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-947837781"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-535462243" class="accordion-body collapse ">
+            <div id="namespace-947837781" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-201884658"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-174746800"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-201884658" class="accordion-body collapse ">
+            <div id="namespace-174746800" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-483188225"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-797628092"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-483188225" class="accordion-body collapse ">
+            <div id="namespace-797628092" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1844829726"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-622593375"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1844829726" class="accordion-body collapse ">
+            <div id="namespace-622593375" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1045367241"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-643516385"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1045367241" class="accordion-body collapse ">
+            <div id="namespace-643516385" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-601596306"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1661128253"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-601596306" class="accordion-body collapse ">
+            <div id="namespace-1661128253" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-94310964"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1348052543"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-94310964" class="accordion-body collapse ">
+            <div id="namespace-1348052543" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-352651610"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1551309319"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-352651610" class="accordion-body collapse ">
+            <div id="namespace-1551309319" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-780987803"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1163621472"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-780987803" class="accordion-body collapse ">
+            <div id="namespace-1163621472" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-288627644"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-280287044"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-288627644" class="accordion-body collapse ">
+            <div id="namespace-280287044" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1855392999"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1712335100"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1855392999" class="accordion-body collapse ">
+            <div id="namespace-1712335100" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.HashPhone.html b/docs/files/Threema.Console.Command.HashPhone.html
index df75115..09d6b92 100644
--- a/docs/files/Threema.Console.Command.HashPhone.html
+++ b/docs/files/Threema.Console.Command.HashPhone.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2023915799"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-562951273"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-2023915799" class="accordion-body collapse in">
+            <div id="namespace-562951273" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-942621035"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2024105309"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-942621035" class="accordion-body collapse ">
+            <div id="namespace-2024105309" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-79510998"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-972066411"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-79510998" class="accordion-body collapse ">
+            <div id="namespace-972066411" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1570644776"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1345369651"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1570644776" class="accordion-body collapse ">
+            <div id="namespace-1345369651" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1808051598"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1216596587"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1808051598" class="accordion-body collapse ">
+            <div id="namespace-1216596587" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-691617695"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1173574027"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-691617695" class="accordion-body collapse ">
+            <div id="namespace-1173574027" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-379039661"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2088494696"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-379039661" class="accordion-body collapse ">
+            <div id="namespace-2088494696" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-979736151"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1496404220"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-979736151" class="accordion-body collapse ">
+            <div id="namespace-1496404220" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-217790641"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-855940381"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-217790641" class="accordion-body collapse ">
+            <div id="namespace-855940381" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1946036165"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1432001022"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1946036165" class="accordion-body collapse ">
+            <div id="namespace-1432001022" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1845559074"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-709491249"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1845559074" class="accordion-body collapse ">
+            <div id="namespace-709491249" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-369499785"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1910818099"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-369499785" class="accordion-body collapse ">
+            <div id="namespace-1910818099" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1485254733"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1669738786"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1485254733" class="accordion-body collapse ">
+            <div id="namespace-1669738786" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-21604796"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-540125317"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-21604796" class="accordion-body collapse ">
+            <div id="namespace-540125317" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.LookupIdByEmail.html b/docs/files/Threema.Console.Command.LookupIdByEmail.html
index 818d3ce..e3b743c 100644
--- a/docs/files/Threema.Console.Command.LookupIdByEmail.html
+++ b/docs/files/Threema.Console.Command.LookupIdByEmail.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1205017209"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-112630283"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1205017209" class="accordion-body collapse in">
+            <div id="namespace-112630283" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-776726551"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-392707274"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-776726551" class="accordion-body collapse ">
+            <div id="namespace-392707274" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1004910352"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1442496024"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1004910352" class="accordion-body collapse ">
+            <div id="namespace-1442496024" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1712585900"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-194043683"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1712585900" class="accordion-body collapse ">
+            <div id="namespace-194043683" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-526956"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1433209231"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-526956" class="accordion-body collapse ">
+            <div id="namespace-1433209231" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2118745652"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1794446182"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-2118745652" class="accordion-body collapse ">
+            <div id="namespace-1794446182" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1616812194"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-49531667"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1616812194" class="accordion-body collapse ">
+            <div id="namespace-49531667" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-372909426"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1043798741"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-372909426" class="accordion-body collapse ">
+            <div id="namespace-1043798741" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2102233874"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-143688095"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-2102233874" class="accordion-body collapse ">
+            <div id="namespace-143688095" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1439714233"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-585028594"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1439714233" class="accordion-body collapse ">
+            <div id="namespace-585028594" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-755929783"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-957088657"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-755929783" class="accordion-body collapse ">
+            <div id="namespace-957088657" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1174702030"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-776105929"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1174702030" class="accordion-body collapse ">
+            <div id="namespace-776105929" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-304803259"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-606345713"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-304803259" class="accordion-body collapse ">
+            <div id="namespace-606345713" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2019405087"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1528158314"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2019405087" class="accordion-body collapse ">
+            <div id="namespace-1528158314" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.LookupIdByPhoneNo.html b/docs/files/Threema.Console.Command.LookupIdByPhoneNo.html
index 7566a59..97d794f 100644
--- a/docs/files/Threema.Console.Command.LookupIdByPhoneNo.html
+++ b/docs/files/Threema.Console.Command.LookupIdByPhoneNo.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-215873522"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1238539535"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-215873522" class="accordion-body collapse in">
+            <div id="namespace-1238539535" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-497919552"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1832611286"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-497919552" class="accordion-body collapse ">
+            <div id="namespace-1832611286" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1889353579"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1573473112"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1889353579" class="accordion-body collapse ">
+            <div id="namespace-1573473112" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-967660026"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1207648849"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-967660026" class="accordion-body collapse ">
+            <div id="namespace-1207648849" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1605334399"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1418538820"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1605334399" class="accordion-body collapse ">
+            <div id="namespace-1418538820" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-288291254"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1175864519"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-288291254" class="accordion-body collapse ">
+            <div id="namespace-1175864519" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1831085305"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1477205314"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1831085305" class="accordion-body collapse ">
+            <div id="namespace-1477205314" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1198833061"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1023771857"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1198833061" class="accordion-body collapse ">
+            <div id="namespace-1023771857" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-601149521"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1352304612"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-601149521" class="accordion-body collapse ">
+            <div id="namespace-1352304612" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1813244122"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-450781545"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1813244122" class="accordion-body collapse ">
+            <div id="namespace-450781545" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1883620635"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1945612432"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1883620635" class="accordion-body collapse ">
+            <div id="namespace-1945612432" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1219954994"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1811016634"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1219954994" class="accordion-body collapse ">
+            <div id="namespace-1811016634" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-41021339"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1955542197"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-41021339" class="accordion-body collapse ">
+            <div id="namespace-1955542197" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1190951921"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1221306791"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1190951921" class="accordion-body collapse ">
+            <div id="namespace-1221306791" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.LookupPublicKeyById.html b/docs/files/Threema.Console.Command.LookupPublicKeyById.html
index 36fcbb7..24b0ef0 100644
--- a/docs/files/Threema.Console.Command.LookupPublicKeyById.html
+++ b/docs/files/Threema.Console.Command.LookupPublicKeyById.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-301214857"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1132088891"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-301214857" class="accordion-body collapse in">
+            <div id="namespace-1132088891" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-742780922"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1002457471"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-742780922" class="accordion-body collapse ">
+            <div id="namespace-1002457471" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-371082757"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1189999636"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-371082757" class="accordion-body collapse ">
+            <div id="namespace-1189999636" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-992387205"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1153626800"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-992387205" class="accordion-body collapse ">
+            <div id="namespace-1153626800" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1559320989"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-672213476"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1559320989" class="accordion-body collapse ">
+            <div id="namespace-672213476" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-684383579"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1760548941"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-684383579" class="accordion-body collapse ">
+            <div id="namespace-1760548941" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-440419512"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1996692666"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-440419512" class="accordion-body collapse ">
+            <div id="namespace-1996692666" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-772952570"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1600229251"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-772952570" class="accordion-body collapse ">
+            <div id="namespace-1600229251" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-703858093"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1516351229"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-703858093" class="accordion-body collapse ">
+            <div id="namespace-1516351229" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-863025854"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-194631488"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-863025854" class="accordion-body collapse ">
+            <div id="namespace-194631488" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-693329859"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-851297945"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-693329859" class="accordion-body collapse ">
+            <div id="namespace-851297945" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-562980353"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1943100015"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-562980353" class="accordion-body collapse ">
+            <div id="namespace-1943100015" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1695502622"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1025701710"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1695502622" class="accordion-body collapse ">
+            <div id="namespace-1025701710" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-310201623"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-606606558"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-310201623" class="accordion-body collapse ">
+            <div id="namespace-606606558" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.ReceiveMessage.html b/docs/files/Threema.Console.Command.ReceiveMessage.html
index 0454485..edc565a 100644
--- a/docs/files/Threema.Console.Command.ReceiveMessage.html
+++ b/docs/files/Threema.Console.Command.ReceiveMessage.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1769342472"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1082565622"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1769342472" class="accordion-body collapse in">
+            <div id="namespace-1082565622" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-289215564"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1905723136"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-289215564" class="accordion-body collapse ">
+            <div id="namespace-1905723136" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-505416398"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2013549836"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-505416398" class="accordion-body collapse ">
+            <div id="namespace-2013549836" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1576912279"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1844485186"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1576912279" class="accordion-body collapse ">
+            <div id="namespace-1844485186" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1939611055"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-152958809"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1939611055" class="accordion-body collapse ">
+            <div id="namespace-152958809" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1178323699"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1735606614"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1178323699" class="accordion-body collapse ">
+            <div id="namespace-1735606614" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1924221453"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-635127291"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1924221453" class="accordion-body collapse ">
+            <div id="namespace-635127291" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-29304445"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2067564852"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-29304445" class="accordion-body collapse ">
+            <div id="namespace-2067564852" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-378316899"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-427400593"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-378316899" class="accordion-body collapse ">
+            <div id="namespace-427400593" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1310584541"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-631633047"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1310584541" class="accordion-body collapse ">
+            <div id="namespace-631633047" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-379508223"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1495572490"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-379508223" class="accordion-body collapse ">
+            <div id="namespace-1495572490" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-867645228"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1204695958"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-867645228" class="accordion-body collapse ">
+            <div id="namespace-1204695958" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1970472454"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-843498065"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1970472454" class="accordion-body collapse ">
+            <div id="namespace-843498065" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-100411357"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-643360082"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-100411357" class="accordion-body collapse ">
+            <div id="namespace-643360082" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.SendE2EFile.html b/docs/files/Threema.Console.Command.SendE2EFile.html
index 3ac7a8e..5e75efb 100644
--- a/docs/files/Threema.Console.Command.SendE2EFile.html
+++ b/docs/files/Threema.Console.Command.SendE2EFile.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-946576058"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1247536919"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-946576058" class="accordion-body collapse in">
+            <div id="namespace-1247536919" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2111468490"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-182418391"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-2111468490" class="accordion-body collapse ">
+            <div id="namespace-182418391" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-527978665"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1050318844"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-527978665" class="accordion-body collapse ">
+            <div id="namespace-1050318844" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2145559138"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1639897338"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-2145559138" class="accordion-body collapse ">
+            <div id="namespace-1639897338" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1808669952"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1885503294"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1808669952" class="accordion-body collapse ">
+            <div id="namespace-1885503294" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-478830078"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1981853921"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-478830078" class="accordion-body collapse ">
+            <div id="namespace-1981853921" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-380274989"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-146958459"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-380274989" class="accordion-body collapse ">
+            <div id="namespace-146958459" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1728421402"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-653507529"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1728421402" class="accordion-body collapse ">
+            <div id="namespace-653507529" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-948570483"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-615975788"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-948570483" class="accordion-body collapse ">
+            <div id="namespace-615975788" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-47318795"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-212632427"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-47318795" class="accordion-body collapse ">
+            <div id="namespace-212632427" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-901765536"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1204786453"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-901765536" class="accordion-body collapse ">
+            <div id="namespace-1204786453" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-19373529"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1662076124"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-19373529" class="accordion-body collapse ">
+            <div id="namespace-1662076124" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1306297036"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-87431310"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1306297036" class="accordion-body collapse ">
+            <div id="namespace-87431310" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-882231097"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1948029419"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-882231097" class="accordion-body collapse ">
+            <div id="namespace-1948029419" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.SendE2EImage.html b/docs/files/Threema.Console.Command.SendE2EImage.html
index 0f1102e..0022871 100644
--- a/docs/files/Threema.Console.Command.SendE2EImage.html
+++ b/docs/files/Threema.Console.Command.SendE2EImage.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-425325133"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-652186069"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-425325133" class="accordion-body collapse in">
+            <div id="namespace-652186069" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1881786140"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1158916630"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1881786140" class="accordion-body collapse ">
+            <div id="namespace-1158916630" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-72426402"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1812442291"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-72426402" class="accordion-body collapse ">
+            <div id="namespace-1812442291" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1275771906"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-957975154"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1275771906" class="accordion-body collapse ">
+            <div id="namespace-957975154" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1751645999"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1117051047"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1751645999" class="accordion-body collapse ">
+            <div id="namespace-1117051047" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-202521239"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1344054142"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-202521239" class="accordion-body collapse ">
+            <div id="namespace-1344054142" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-685493360"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-821281732"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-685493360" class="accordion-body collapse ">
+            <div id="namespace-821281732" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1721359417"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-16794334"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1721359417" class="accordion-body collapse ">
+            <div id="namespace-16794334" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-18032420"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1486310164"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-18032420" class="accordion-body collapse ">
+            <div id="namespace-1486310164" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1464684350"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-686415547"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1464684350" class="accordion-body collapse ">
+            <div id="namespace-686415547" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1492678498"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-869283169"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1492678498" class="accordion-body collapse ">
+            <div id="namespace-869283169" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-948434781"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-100715411"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-948434781" class="accordion-body collapse ">
+            <div id="namespace-100715411" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-216874224"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1631219987"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-216874224" class="accordion-body collapse ">
+            <div id="namespace-1631219987" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1862815376"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-640443672"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1862815376" class="accordion-body collapse ">
+            <div id="namespace-640443672" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.SendE2EText.html b/docs/files/Threema.Console.Command.SendE2EText.html
index 4f9b397..5b8f017 100644
--- a/docs/files/Threema.Console.Command.SendE2EText.html
+++ b/docs/files/Threema.Console.Command.SendE2EText.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-199881817"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1917659199"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-199881817" class="accordion-body collapse in">
+            <div id="namespace-1917659199" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-697532592"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1119385093"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-697532592" class="accordion-body collapse ">
+            <div id="namespace-1119385093" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2068600431"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1864179601"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-2068600431" class="accordion-body collapse ">
+            <div id="namespace-1864179601" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1058668481"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-396106082"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1058668481" class="accordion-body collapse ">
+            <div id="namespace-396106082" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1562605593"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1884444318"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1562605593" class="accordion-body collapse ">
+            <div id="namespace-1884444318" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-227475094"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1059995343"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-227475094" class="accordion-body collapse ">
+            <div id="namespace-1059995343" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-786791692"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-528457464"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-786791692" class="accordion-body collapse ">
+            <div id="namespace-528457464" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1133016115"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2090098787"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1133016115" class="accordion-body collapse ">
+            <div id="namespace-2090098787" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1509380898"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-554831800"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1509380898" class="accordion-body collapse ">
+            <div id="namespace-554831800" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1069893034"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1143838314"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1069893034" class="accordion-body collapse ">
+            <div id="namespace-1143838314" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1506999912"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1355358028"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1506999912" class="accordion-body collapse ">
+            <div id="namespace-1355358028" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1105283124"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1598957120"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1105283124" class="accordion-body collapse ">
+            <div id="namespace-1598957120" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1569027651"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1608738705"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1569027651" class="accordion-body collapse ">
+            <div id="namespace-1608738705" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1234477376"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-677502665"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1234477376" class="accordion-body collapse ">
+            <div id="namespace-677502665" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Command.SendSimple.html b/docs/files/Threema.Console.Command.SendSimple.html
index f3b93be..f85c281 100644
--- a/docs/files/Threema.Console.Command.SendSimple.html
+++ b/docs/files/Threema.Console.Command.SendSimple.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1391328536"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2071416186"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1391328536" class="accordion-body collapse in">
+            <div id="namespace-2071416186" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1122424920"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-972330857"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1122424920" class="accordion-body collapse ">
+            <div id="namespace-972330857" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-355421821"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-652668737"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-355421821" class="accordion-body collapse ">
+            <div id="namespace-652668737" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-787680023"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1407760304"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-787680023" class="accordion-body collapse ">
+            <div id="namespace-1407760304" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1898003140"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-31352393"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1898003140" class="accordion-body collapse ">
+            <div id="namespace-31352393" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-687441941"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2130555992"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-687441941" class="accordion-body collapse ">
+            <div id="namespace-2130555992" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-120075673"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-33242690"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-120075673" class="accordion-body collapse ">
+            <div id="namespace-33242690" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1076892575"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1501226816"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1076892575" class="accordion-body collapse ">
+            <div id="namespace-1501226816" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1297750324"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1276257371"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1297750324" class="accordion-body collapse ">
+            <div id="namespace-1276257371" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1191717797"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2118229561"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1191717797" class="accordion-body collapse ">
+            <div id="namespace-2118229561" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-989592015"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1140829492"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-989592015" class="accordion-body collapse ">
+            <div id="namespace-1140829492" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-691315428"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-501575340"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-691315428" class="accordion-body collapse ">
+            <div id="namespace-501575340" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-75660835"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-471364715"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-75660835" class="accordion-body collapse ">
+            <div id="namespace-471364715" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-42130340"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2032747299"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-42130340" class="accordion-body collapse ">
+            <div id="namespace-2032747299" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Common.html b/docs/files/Threema.Console.Common.html
index b6f52ab..057007c 100644
--- a/docs/files/Threema.Console.Common.html
+++ b/docs/files/Threema.Console.Common.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1298264511"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-173058494"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1298264511" class="accordion-body collapse in">
+            <div id="namespace-173058494" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-581299596"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-314469419"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-581299596" class="accordion-body collapse ">
+            <div id="namespace-314469419" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-940077311"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1975488619"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-940077311" class="accordion-body collapse ">
+            <div id="namespace-1975488619" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1709121386"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1520107475"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1709121386" class="accordion-body collapse ">
+            <div id="namespace-1520107475" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-358707160"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2040405886"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-358707160" class="accordion-body collapse ">
+            <div id="namespace-2040405886" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-817280715"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-152001785"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-817280715" class="accordion-body collapse ">
+            <div id="namespace-152001785" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1669695974"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-907212521"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1669695974" class="accordion-body collapse ">
+            <div id="namespace-907212521" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-372099411"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-157785214"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-372099411" class="accordion-body collapse ">
+            <div id="namespace-157785214" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-137341906"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-579987734"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-137341906" class="accordion-body collapse ">
+            <div id="namespace-579987734" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1958470985"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1153954371"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1958470985" class="accordion-body collapse ">
+            <div id="namespace-1153954371" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1171660704"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1012895238"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1171660704" class="accordion-body collapse ">
+            <div id="namespace-1012895238" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-46672956"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1997204236"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-46672956" class="accordion-body collapse ">
+            <div id="namespace-1997204236" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-415409833"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1683903066"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-415409833" class="accordion-body collapse ">
+            <div id="namespace-1683903066" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1028694361"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1787970179"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1028694361" class="accordion-body collapse ">
+            <div id="namespace-1787970179" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Console.Run.html b/docs/files/Threema.Console.Run.html
index a962ada..5f56e5a 100644
--- a/docs/files/Threema.Console.Run.html
+++ b/docs/files/Threema.Console.Run.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1978445651"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-633692255"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1978445651" class="accordion-body collapse in">
+            <div id="namespace-633692255" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-808313350"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1863335087"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-808313350" class="accordion-body collapse ">
+            <div id="namespace-1863335087" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1412376603"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1415207117"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1412376603" class="accordion-body collapse ">
+            <div id="namespace-1415207117" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-568947947"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-472805106"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-568947947" class="accordion-body collapse ">
+            <div id="namespace-472805106" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-726963553"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-190578441"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-726963553" class="accordion-body collapse ">
+            <div id="namespace-190578441" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-411104803"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-895218228"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-411104803" class="accordion-body collapse ">
+            <div id="namespace-895218228" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1130950152"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2026394638"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1130950152" class="accordion-body collapse ">
+            <div id="namespace-2026394638" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1285757917"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1032818730"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1285757917" class="accordion-body collapse ">
+            <div id="namespace-1032818730" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-598092438"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1087261048"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-598092438" class="accordion-body collapse ">
+            <div id="namespace-1087261048" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1068110478"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-956495507"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1068110478" class="accordion-body collapse ">
+            <div id="namespace-956495507" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-602280405"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-68512446"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-602280405" class="accordion-body collapse ">
+            <div id="namespace-68512446" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1336455576"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1900683746"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1336455576" class="accordion-body collapse ">
+            <div id="namespace-1900683746" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-450566156"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1418907693"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-450566156" class="accordion-body collapse ">
+            <div id="namespace-1418907693" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1204388451"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-13313601"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1204388451" class="accordion-body collapse ">
+            <div id="namespace-13313601" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Core.AssocArray.html b/docs/files/Threema.Core.AssocArray.html
index 977567a..407a5ca 100644
--- a/docs/files/Threema.Core.AssocArray.html
+++ b/docs/files/Threema.Core.AssocArray.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1835183080"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2137310361"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1835183080" class="accordion-body collapse in">
+            <div id="namespace-2137310361" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1313143446"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-17706019"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1313143446" class="accordion-body collapse ">
+            <div id="namespace-17706019" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1789356602"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-173248764"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1789356602" class="accordion-body collapse ">
+            <div id="namespace-173248764" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-494705994"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1903327679"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-494705994" class="accordion-body collapse ">
+            <div id="namespace-1903327679" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-695424998"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2082301547"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-695424998" class="accordion-body collapse ">
+            <div id="namespace-2082301547" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1061961243"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-933251877"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1061961243" class="accordion-body collapse ">
+            <div id="namespace-933251877" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1050484114"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-341811740"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1050484114" class="accordion-body collapse ">
+            <div id="namespace-341811740" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-542890140"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-703062931"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-542890140" class="accordion-body collapse ">
+            <div id="namespace-703062931" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1803735050"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-216341553"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1803735050" class="accordion-body collapse ">
+            <div id="namespace-216341553" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1653948504"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-484528298"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1653948504" class="accordion-body collapse ">
+            <div id="namespace-484528298" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1604871677"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-402396414"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1604871677" class="accordion-body collapse ">
+            <div id="namespace-402396414" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1474308485"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-253264913"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1474308485" class="accordion-body collapse ">
+            <div id="namespace-253264913" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-146413194"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1773388466"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-146413194" class="accordion-body collapse ">
+            <div id="namespace-1773388466" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-565699106"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2128146746"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-565699106" class="accordion-body collapse ">
+            <div id="namespace-2128146746" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Core.Exception.html b/docs/files/Threema.Core.Exception.html
index 2b8ab5c..db26563 100644
--- a/docs/files/Threema.Core.Exception.html
+++ b/docs/files/Threema.Core.Exception.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1904289093"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-716810556"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1904289093" class="accordion-body collapse in">
+            <div id="namespace-716810556" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-695268283"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-717852585"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-695268283" class="accordion-body collapse ">
+            <div id="namespace-717852585" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-730700025"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-606151562"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-730700025" class="accordion-body collapse ">
+            <div id="namespace-606151562" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1547232795"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1443493295"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1547232795" class="accordion-body collapse ">
+            <div id="namespace-1443493295" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-465057664"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1392474171"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-465057664" class="accordion-body collapse ">
+            <div id="namespace-1392474171" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-343596977"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-104718053"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-343596977" class="accordion-body collapse ">
+            <div id="namespace-104718053" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1610777095"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-649576324"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1610777095" class="accordion-body collapse ">
+            <div id="namespace-649576324" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1324811445"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1210781875"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1324811445" class="accordion-body collapse ">
+            <div id="namespace-1210781875" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1670297264"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-573644826"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1670297264" class="accordion-body collapse ">
+            <div id="namespace-573644826" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-355040767"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1463903349"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-355040767" class="accordion-body collapse ">
+            <div id="namespace-1463903349" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-155499681"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-725274668"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-155499681" class="accordion-body collapse ">
+            <div id="namespace-725274668" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1307592783"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-605428396"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1307592783" class="accordion-body collapse ">
+            <div id="namespace-605428396" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1451536287"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1246852682"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1451536287" class="accordion-body collapse ">
+            <div id="namespace-1246852682" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1328474994"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-792739186"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1328474994" class="accordion-body collapse ">
+            <div id="namespace-792739186" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Core.KeyPair.html b/docs/files/Threema.Core.KeyPair.html
index 9abfe96..4d62e88 100644
--- a/docs/files/Threema.Core.KeyPair.html
+++ b/docs/files/Threema.Core.KeyPair.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1328281057"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-882290187"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1328281057" class="accordion-body collapse in">
+            <div id="namespace-882290187" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-215484517"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1242056747"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-215484517" class="accordion-body collapse ">
+            <div id="namespace-1242056747" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-362451410"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-565860295"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-362451410" class="accordion-body collapse ">
+            <div id="namespace-565860295" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-350184376"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-407677092"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-350184376" class="accordion-body collapse ">
+            <div id="namespace-407677092" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-941903615"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1809748179"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-941903615" class="accordion-body collapse ">
+            <div id="namespace-1809748179" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-509997944"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-456574402"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-509997944" class="accordion-body collapse ">
+            <div id="namespace-456574402" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2054884334"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1527693211"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-2054884334" class="accordion-body collapse ">
+            <div id="namespace-1527693211" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-615316166"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-770369225"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-615316166" class="accordion-body collapse ">
+            <div id="namespace-770369225" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-515116184"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-982956097"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-515116184" class="accordion-body collapse ">
+            <div id="namespace-982956097" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-182390498"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1610411540"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-182390498" class="accordion-body collapse ">
+            <div id="namespace-1610411540" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-246024754"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-890282996"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-246024754" class="accordion-body collapse ">
+            <div id="namespace-890282996" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-909159436"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-129311225"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-909159436" class="accordion-body collapse ">
+            <div id="namespace-129311225" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1456954479"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-48144070"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1456954479" class="accordion-body collapse ">
+            <div id="namespace-48144070" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-478480761"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2061376788"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-478480761" class="accordion-body collapse ">
+            <div id="namespace-2061376788" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.Core.Url.html b/docs/files/Threema.Core.Url.html
index feca7e9..54033cb 100644
--- a/docs/files/Threema.Core.Url.html
+++ b/docs/files/Threema.Core.Url.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2142873804"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1270594536"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-2142873804" class="accordion-body collapse in">
+            <div id="namespace-1270594536" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-792881006"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1839275370"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-792881006" class="accordion-body collapse ">
+            <div id="namespace-1839275370" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1996258903"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1152857398"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1996258903" class="accordion-body collapse ">
+            <div id="namespace-1152857398" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1737426812"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1473366051"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1737426812" class="accordion-body collapse ">
+            <div id="namespace-1473366051" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-393899251"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-442220632"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-393899251" class="accordion-body collapse ">
+            <div id="namespace-442220632" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1257792429"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-117418877"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1257792429" class="accordion-body collapse ">
+            <div id="namespace-117418877" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1544293819"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-113287053"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1544293819" class="accordion-body collapse ">
+            <div id="namespace-113287053" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-362412465"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1637925587"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-362412465" class="accordion-body collapse ">
+            <div id="namespace-1637925587" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1301948994"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-692262887"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1301948994" class="accordion-body collapse ">
+            <div id="namespace-692262887" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1335614846"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1306702334"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1335614846" class="accordion-body collapse ">
+            <div id="namespace-1306702334" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-834099402"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-6075595"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-834099402" class="accordion-body collapse ">
+            <div id="namespace-6075595" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-255050809"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1517238898"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-255050809" class="accordion-body collapse ">
+            <div id="namespace-1517238898" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1552494765"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-635542825"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1552494765" class="accordion-body collapse ">
+            <div id="namespace-635542825" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1094982077"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-837618354"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1094982077" class="accordion-body collapse ">
+            <div id="namespace-837618354" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.Capability.html b/docs/files/Threema.MsgApi.Commands.Capability.html
index 8022def..d8eb296 100644
--- a/docs/files/Threema.MsgApi.Commands.Capability.html
+++ b/docs/files/Threema.MsgApi.Commands.Capability.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1140308887"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-995487607"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1140308887" class="accordion-body collapse in">
+            <div id="namespace-995487607" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-52545902"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-669483075"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-52545902" class="accordion-body collapse ">
+            <div id="namespace-669483075" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1649231341"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1427421362"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1649231341" class="accordion-body collapse ">
+            <div id="namespace-1427421362" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-363595935"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-853477553"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-363595935" class="accordion-body collapse ">
+            <div id="namespace-853477553" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-285233882"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-457351737"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-285233882" class="accordion-body collapse ">
+            <div id="namespace-457351737" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-760564468"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1244779236"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-760564468" class="accordion-body collapse ">
+            <div id="namespace-1244779236" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-764750252"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1720697488"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-764750252" class="accordion-body collapse ">
+            <div id="namespace-1720697488" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-712373782"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2132240964"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-712373782" class="accordion-body collapse ">
+            <div id="namespace-2132240964" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-136605959"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-649064873"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-136605959" class="accordion-body collapse ">
+            <div id="namespace-649064873" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1742190872"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-235254532"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1742190872" class="accordion-body collapse ">
+            <div id="namespace-235254532" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1265034957"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2073178907"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1265034957" class="accordion-body collapse ">
+            <div id="namespace-2073178907" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1809614788"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1150660317"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1809614788" class="accordion-body collapse ">
+            <div id="namespace-1150660317" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-152711848"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1213083543"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-152711848" class="accordion-body collapse ">
+            <div id="namespace-1213083543" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1957469009"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-186917852"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1957469009" class="accordion-body collapse ">
+            <div id="namespace-186917852" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.CommandInterface.html b/docs/files/Threema.MsgApi.Commands.CommandInterface.html
index 015c66b..f623a45 100644
--- a/docs/files/Threema.MsgApi.Commands.CommandInterface.html
+++ b/docs/files/Threema.MsgApi.Commands.CommandInterface.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1870563850"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1496706088"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1870563850" class="accordion-body collapse in">
+            <div id="namespace-1496706088" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-504359008"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1720832967"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-504359008" class="accordion-body collapse ">
+            <div id="namespace-1720832967" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-675219095"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2067973185"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-675219095" class="accordion-body collapse ">
+            <div id="namespace-2067973185" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1077803543"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1383119697"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1077803543" class="accordion-body collapse ">
+            <div id="namespace-1383119697" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-208932960"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1678609191"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-208932960" class="accordion-body collapse ">
+            <div id="namespace-1678609191" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1128091375"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1326962139"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1128091375" class="accordion-body collapse ">
+            <div id="namespace-1326962139" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1209282653"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1537858570"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1209282653" class="accordion-body collapse ">
+            <div id="namespace-1537858570" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-996831035"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1971179893"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-996831035" class="accordion-body collapse ">
+            <div id="namespace-1971179893" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-387919304"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-895122938"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-387919304" class="accordion-body collapse ">
+            <div id="namespace-895122938" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-234876485"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1334409910"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-234876485" class="accordion-body collapse ">
+            <div id="namespace-1334409910" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-189355074"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2109343732"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-189355074" class="accordion-body collapse ">
+            <div id="namespace-2109343732" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2020682594"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1564802007"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-2020682594" class="accordion-body collapse ">
+            <div id="namespace-1564802007" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2132543559"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1515848445"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2132543559" class="accordion-body collapse ">
+            <div id="namespace-1515848445" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-158480857"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-560251725"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-158480857" class="accordion-body collapse ">
+            <div id="namespace-560251725" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.Credits.html b/docs/files/Threema.MsgApi.Commands.Credits.html
index 187ffcf..7dcde83 100644
--- a/docs/files/Threema.MsgApi.Commands.Credits.html
+++ b/docs/files/Threema.MsgApi.Commands.Credits.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1153656965"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1238552169"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1153656965" class="accordion-body collapse in">
+            <div id="namespace-1238552169" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1575199408"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-511431856"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1575199408" class="accordion-body collapse ">
+            <div id="namespace-511431856" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1100726256"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1333586611"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1100726256" class="accordion-body collapse ">
+            <div id="namespace-1333586611" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-48083237"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-820191492"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-48083237" class="accordion-body collapse ">
+            <div id="namespace-820191492" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1964385075"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-87115980"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1964385075" class="accordion-body collapse ">
+            <div id="namespace-87115980" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1234781239"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1428143535"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1234781239" class="accordion-body collapse ">
+            <div id="namespace-1428143535" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1087648073"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1036786370"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1087648073" class="accordion-body collapse ">
+            <div id="namespace-1036786370" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1352478120"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1699822116"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1352478120" class="accordion-body collapse ">
+            <div id="namespace-1699822116" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1623167122"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1892352656"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1623167122" class="accordion-body collapse ">
+            <div id="namespace-1892352656" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-852896044"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1154756996"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-852896044" class="accordion-body collapse ">
+            <div id="namespace-1154756996" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1636475540"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1867116714"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1636475540" class="accordion-body collapse ">
+            <div id="namespace-1867116714" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2085585196"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1279432926"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-2085585196" class="accordion-body collapse ">
+            <div id="namespace-1279432926" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1324891025"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-135829405"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1324891025" class="accordion-body collapse ">
+            <div id="namespace-135829405" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-82019223"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-739064870"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-82019223" class="accordion-body collapse ">
+            <div id="namespace-739064870" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.DownloadFile.html b/docs/files/Threema.MsgApi.Commands.DownloadFile.html
index a81e88f..7b46fc1 100644
--- a/docs/files/Threema.MsgApi.Commands.DownloadFile.html
+++ b/docs/files/Threema.MsgApi.Commands.DownloadFile.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-991500591"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-567381035"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-991500591" class="accordion-body collapse in">
+            <div id="namespace-567381035" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1029259812"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1114641662"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1029259812" class="accordion-body collapse ">
+            <div id="namespace-1114641662" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1606549532"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1654097225"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1606549532" class="accordion-body collapse ">
+            <div id="namespace-1654097225" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-583328074"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-654772713"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-583328074" class="accordion-body collapse ">
+            <div id="namespace-654772713" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1316928514"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-634926143"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1316928514" class="accordion-body collapse ">
+            <div id="namespace-634926143" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1286459843"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1681456853"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1286459843" class="accordion-body collapse ">
+            <div id="namespace-1681456853" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1071747304"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-228588404"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1071747304" class="accordion-body collapse ">
+            <div id="namespace-228588404" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-55456012"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2037310045"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-55456012" class="accordion-body collapse ">
+            <div id="namespace-2037310045" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1976212996"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1644202374"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1976212996" class="accordion-body collapse ">
+            <div id="namespace-1644202374" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-868173000"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2116890885"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-868173000" class="accordion-body collapse ">
+            <div id="namespace-2116890885" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-243268245"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-735796658"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-243268245" class="accordion-body collapse ">
+            <div id="namespace-735796658" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1077294521"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-151647147"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1077294521" class="accordion-body collapse ">
+            <div id="namespace-151647147" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1791281917"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1795697567"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1791281917" class="accordion-body collapse ">
+            <div id="namespace-1795697567" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1096767692"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2097751723"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1096767692" class="accordion-body collapse ">
+            <div id="namespace-2097751723" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.FetchPublicKey.html b/docs/files/Threema.MsgApi.Commands.FetchPublicKey.html
index e00a6df..62ed815 100644
--- a/docs/files/Threema.MsgApi.Commands.FetchPublicKey.html
+++ b/docs/files/Threema.MsgApi.Commands.FetchPublicKey.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-732511442"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1107254958"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-732511442" class="accordion-body collapse in">
+            <div id="namespace-1107254958" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1791524889"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-487995419"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1791524889" class="accordion-body collapse ">
+            <div id="namespace-487995419" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-274847093"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-152144494"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-274847093" class="accordion-body collapse ">
+            <div id="namespace-152144494" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-402096123"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1525967332"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-402096123" class="accordion-body collapse ">
+            <div id="namespace-1525967332" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-243726439"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1198907869"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-243726439" class="accordion-body collapse ">
+            <div id="namespace-1198907869" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-460114512"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-5906873"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-460114512" class="accordion-body collapse ">
+            <div id="namespace-5906873" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-805304644"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2023791531"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-805304644" class="accordion-body collapse ">
+            <div id="namespace-2023791531" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-991669997"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-687417033"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-991669997" class="accordion-body collapse ">
+            <div id="namespace-687417033" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-911132666"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1054113131"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-911132666" class="accordion-body collapse ">
+            <div id="namespace-1054113131" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1500323617"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-92530372"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1500323617" class="accordion-body collapse ">
+            <div id="namespace-92530372" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1169107280"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1609747357"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1169107280" class="accordion-body collapse ">
+            <div id="namespace-1609747357" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1884220144"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-70044408"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1884220144" class="accordion-body collapse ">
+            <div id="namespace-70044408" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1841673961"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-51565287"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1841673961" class="accordion-body collapse ">
+            <div id="namespace-51565287" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-696340798"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-658556383"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-696340798" class="accordion-body collapse ">
+            <div id="namespace-658556383" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.LookupEmail.html b/docs/files/Threema.MsgApi.Commands.LookupEmail.html
index f7678db..639cbbd 100644
--- a/docs/files/Threema.MsgApi.Commands.LookupEmail.html
+++ b/docs/files/Threema.MsgApi.Commands.LookupEmail.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-25262619"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1234288177"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-25262619" class="accordion-body collapse in">
+            <div id="namespace-1234288177" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-711516676"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1948762299"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-711516676" class="accordion-body collapse ">
+            <div id="namespace-1948762299" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1061669672"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-365153944"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1061669672" class="accordion-body collapse ">
+            <div id="namespace-365153944" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1860274115"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-292977495"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1860274115" class="accordion-body collapse ">
+            <div id="namespace-292977495" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1027819531"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-612645268"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1027819531" class="accordion-body collapse ">
+            <div id="namespace-612645268" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1393323243"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1220198661"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1393323243" class="accordion-body collapse ">
+            <div id="namespace-1220198661" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1028720745"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-634596418"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1028720745" class="accordion-body collapse ">
+            <div id="namespace-634596418" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-501301466"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1883937799"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-501301466" class="accordion-body collapse ">
+            <div id="namespace-1883937799" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1721134680"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1841476769"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1721134680" class="accordion-body collapse ">
+            <div id="namespace-1841476769" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-524316324"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2033727987"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-524316324" class="accordion-body collapse ">
+            <div id="namespace-2033727987" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-249256402"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1142294626"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-249256402" class="accordion-body collapse ">
+            <div id="namespace-1142294626" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-305815941"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1132622320"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-305815941" class="accordion-body collapse ">
+            <div id="namespace-1132622320" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1474501671"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-511118163"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1474501671" class="accordion-body collapse ">
+            <div id="namespace-511118163" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1529619448"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-6247684"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1529619448" class="accordion-body collapse ">
+            <div id="namespace-6247684" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.LookupPhone.html b/docs/files/Threema.MsgApi.Commands.LookupPhone.html
index 89f0221..b96db27 100644
--- a/docs/files/Threema.MsgApi.Commands.LookupPhone.html
+++ b/docs/files/Threema.MsgApi.Commands.LookupPhone.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-175250971"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-643872436"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-175250971" class="accordion-body collapse in">
+            <div id="namespace-643872436" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1225781955"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1701318541"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1225781955" class="accordion-body collapse ">
+            <div id="namespace-1701318541" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-257424624"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1802377153"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-257424624" class="accordion-body collapse ">
+            <div id="namespace-1802377153" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-343010670"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1338819607"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-343010670" class="accordion-body collapse ">
+            <div id="namespace-1338819607" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1401112931"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1628457744"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1401112931" class="accordion-body collapse ">
+            <div id="namespace-1628457744" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-258693918"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1250446411"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-258693918" class="accordion-body collapse ">
+            <div id="namespace-1250446411" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1628537602"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-288684674"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1628537602" class="accordion-body collapse ">
+            <div id="namespace-288684674" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1376157703"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-861028710"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1376157703" class="accordion-body collapse ">
+            <div id="namespace-861028710" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-194411500"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1406984330"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-194411500" class="accordion-body collapse ">
+            <div id="namespace-1406984330" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-812226135"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-926209439"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-812226135" class="accordion-body collapse ">
+            <div id="namespace-926209439" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1236001828"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2020579224"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1236001828" class="accordion-body collapse ">
+            <div id="namespace-2020579224" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1559329638"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1431560445"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1559329638" class="accordion-body collapse ">
+            <div id="namespace-1431560445" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1142513416"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1751754455"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1142513416" class="accordion-body collapse ">
+            <div id="namespace-1751754455" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-892275217"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-622454026"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-892275217" class="accordion-body collapse ">
+            <div id="namespace-622454026" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.MultiPartCommandInterface.html b/docs/files/Threema.MsgApi.Commands.MultiPartCommandInterface.html
index a991050..bbad70d 100644
--- a/docs/files/Threema.MsgApi.Commands.MultiPartCommandInterface.html
+++ b/docs/files/Threema.MsgApi.Commands.MultiPartCommandInterface.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-69364682"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1605660831"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-69364682" class="accordion-body collapse in">
+            <div id="namespace-1605660831" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-627218631"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-832418369"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-627218631" class="accordion-body collapse ">
+            <div id="namespace-832418369" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1101301672"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-908126646"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1101301672" class="accordion-body collapse ">
+            <div id="namespace-908126646" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-390518560"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1797572096"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-390518560" class="accordion-body collapse ">
+            <div id="namespace-1797572096" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1108590819"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1730832647"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1108590819" class="accordion-body collapse ">
+            <div id="namespace-1730832647" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1247335029"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-500116392"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1247335029" class="accordion-body collapse ">
+            <div id="namespace-500116392" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-503053905"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2038519645"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-503053905" class="accordion-body collapse ">
+            <div id="namespace-2038519645" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1462016522"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1508111443"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1462016522" class="accordion-body collapse ">
+            <div id="namespace-1508111443" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1299083762"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-307199698"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1299083762" class="accordion-body collapse ">
+            <div id="namespace-307199698" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-833569011"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1298887688"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-833569011" class="accordion-body collapse ">
+            <div id="namespace-1298887688" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1171915798"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-490865595"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1171915798" class="accordion-body collapse ">
+            <div id="namespace-490865595" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1440941123"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1407940965"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1440941123" class="accordion-body collapse ">
+            <div id="namespace-1407940965" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-695383464"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1140404218"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-695383464" class="accordion-body collapse ">
+            <div id="namespace-1140404218" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-240040984"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-460563360"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-240040984" class="accordion-body collapse ">
+            <div id="namespace-460563360" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.Results.CapabilityResult.html b/docs/files/Threema.MsgApi.Commands.Results.CapabilityResult.html
index a0964e9..bbdb397 100644
--- a/docs/files/Threema.MsgApi.Commands.Results.CapabilityResult.html
+++ b/docs/files/Threema.MsgApi.Commands.Results.CapabilityResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1912054278"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-833208909"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1912054278" class="accordion-body collapse in">
+            <div id="namespace-833208909" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-643174711"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-588206343"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-643174711" class="accordion-body collapse ">
+            <div id="namespace-588206343" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1741252505"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-516322973"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1741252505" class="accordion-body collapse ">
+            <div id="namespace-516322973" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1637989016"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1750668737"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1637989016" class="accordion-body collapse ">
+            <div id="namespace-1750668737" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2039764016"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-991617085"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-2039764016" class="accordion-body collapse ">
+            <div id="namespace-991617085" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1664707"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1274746843"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1664707" class="accordion-body collapse ">
+            <div id="namespace-1274746843" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-178411757"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1917541826"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-178411757" class="accordion-body collapse ">
+            <div id="namespace-1917541826" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1462202582"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-4582538"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1462202582" class="accordion-body collapse ">
+            <div id="namespace-4582538" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1528972657"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-673491280"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1528972657" class="accordion-body collapse ">
+            <div id="namespace-673491280" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-339279009"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1822978045"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-339279009" class="accordion-body collapse ">
+            <div id="namespace-1822978045" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-780475979"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-638899596"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-780475979" class="accordion-body collapse ">
+            <div id="namespace-638899596" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1761021459"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1536924647"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1761021459" class="accordion-body collapse ">
+            <div id="namespace-1536924647" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2056027434"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1094112908"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2056027434" class="accordion-body collapse ">
+            <div id="namespace-1094112908" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-842478406"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1316362246"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-842478406" class="accordion-body collapse ">
+            <div id="namespace-1316362246" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.Results.CreditsResult.html b/docs/files/Threema.MsgApi.Commands.Results.CreditsResult.html
index 9790762..70ff2ec 100644
--- a/docs/files/Threema.MsgApi.Commands.Results.CreditsResult.html
+++ b/docs/files/Threema.MsgApi.Commands.Results.CreditsResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-69807392"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1872259622"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-69807392" class="accordion-body collapse in">
+            <div id="namespace-1872259622" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1974582053"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-171900680"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1974582053" class="accordion-body collapse ">
+            <div id="namespace-171900680" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-419086998"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1707130968"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-419086998" class="accordion-body collapse ">
+            <div id="namespace-1707130968" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-54355726"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-65425805"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-54355726" class="accordion-body collapse ">
+            <div id="namespace-65425805" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1036098623"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1333375209"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1036098623" class="accordion-body collapse ">
+            <div id="namespace-1333375209" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-396042707"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1008230682"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-396042707" class="accordion-body collapse ">
+            <div id="namespace-1008230682" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1526911018"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1348932270"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1526911018" class="accordion-body collapse ">
+            <div id="namespace-1348932270" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1632865268"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1669432784"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1632865268" class="accordion-body collapse ">
+            <div id="namespace-1669432784" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-511188264"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-600450719"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-511188264" class="accordion-body collapse ">
+            <div id="namespace-600450719" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1753540875"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1525295324"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1753540875" class="accordion-body collapse ">
+            <div id="namespace-1525295324" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-436642420"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-676529272"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-436642420" class="accordion-body collapse ">
+            <div id="namespace-676529272" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2014402646"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-208508556"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-2014402646" class="accordion-body collapse ">
+            <div id="namespace-208508556" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-528652308"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-818114444"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-528652308" class="accordion-body collapse ">
+            <div id="namespace-818114444" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-419174819"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-360629175"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-419174819" class="accordion-body collapse ">
+            <div id="namespace-360629175" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.Results.DownloadFileResult.html b/docs/files/Threema.MsgApi.Commands.Results.DownloadFileResult.html
index 0f2de1e..f6e3d3e 100644
--- a/docs/files/Threema.MsgApi.Commands.Results.DownloadFileResult.html
+++ b/docs/files/Threema.MsgApi.Commands.Results.DownloadFileResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-780122141"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-899223742"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-780122141" class="accordion-body collapse in">
+            <div id="namespace-899223742" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2033042039"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-82401495"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-2033042039" class="accordion-body collapse ">
+            <div id="namespace-82401495" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1851796535"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1149960972"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1851796535" class="accordion-body collapse ">
+            <div id="namespace-1149960972" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1712466671"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1164030582"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1712466671" class="accordion-body collapse ">
+            <div id="namespace-1164030582" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2039435381"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-844004264"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-2039435381" class="accordion-body collapse ">
+            <div id="namespace-844004264" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1945087552"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1133092745"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1945087552" class="accordion-body collapse ">
+            <div id="namespace-1133092745" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-195757735"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-630990619"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-195757735" class="accordion-body collapse ">
+            <div id="namespace-630990619" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1313757329"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1840434620"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1313757329" class="accordion-body collapse ">
+            <div id="namespace-1840434620" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2142246732"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1791773228"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-2142246732" class="accordion-body collapse ">
+            <div id="namespace-1791773228" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-434091820"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1786266860"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-434091820" class="accordion-body collapse ">
+            <div id="namespace-1786266860" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1834365286"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1387390864"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1834365286" class="accordion-body collapse ">
+            <div id="namespace-1387390864" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-709043993"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1226749902"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-709043993" class="accordion-body collapse ">
+            <div id="namespace-1226749902" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-850196728"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1409145063"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-850196728" class="accordion-body collapse ">
+            <div id="namespace-1409145063" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-370810794"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-876595967"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-370810794" class="accordion-body collapse ">
+            <div id="namespace-876595967" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.Results.FetchPublicKeyResult.html b/docs/files/Threema.MsgApi.Commands.Results.FetchPublicKeyResult.html
index b627a80..c14181a 100644
--- a/docs/files/Threema.MsgApi.Commands.Results.FetchPublicKeyResult.html
+++ b/docs/files/Threema.MsgApi.Commands.Results.FetchPublicKeyResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-381347414"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2063011367"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-381347414" class="accordion-body collapse in">
+            <div id="namespace-2063011367" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1688388318"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1753618904"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1688388318" class="accordion-body collapse ">
+            <div id="namespace-1753618904" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-286280140"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-241650198"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-286280140" class="accordion-body collapse ">
+            <div id="namespace-241650198" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-795929713"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-860682655"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-795929713" class="accordion-body collapse ">
+            <div id="namespace-860682655" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1154423645"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-427134577"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1154423645" class="accordion-body collapse ">
+            <div id="namespace-427134577" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1035078273"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-310003527"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1035078273" class="accordion-body collapse ">
+            <div id="namespace-310003527" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1452755668"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1415401520"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1452755668" class="accordion-body collapse ">
+            <div id="namespace-1415401520" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1531478670"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1956501666"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1531478670" class="accordion-body collapse ">
+            <div id="namespace-1956501666" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-249011012"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-36304873"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-249011012" class="accordion-body collapse ">
+            <div id="namespace-36304873" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-589028893"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1362906020"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-589028893" class="accordion-body collapse ">
+            <div id="namespace-1362906020" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-344327616"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1414978374"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-344327616" class="accordion-body collapse ">
+            <div id="namespace-1414978374" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1713688705"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1846093945"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1713688705" class="accordion-body collapse ">
+            <div id="namespace-1846093945" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-17385052"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-347086758"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-17385052" class="accordion-body collapse ">
+            <div id="namespace-347086758" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-119795045"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-653278583"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-119795045" class="accordion-body collapse ">
+            <div id="namespace-653278583" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.Results.LookupIdResult.html b/docs/files/Threema.MsgApi.Commands.Results.LookupIdResult.html
index ee36c30..66624e7 100644
--- a/docs/files/Threema.MsgApi.Commands.Results.LookupIdResult.html
+++ b/docs/files/Threema.MsgApi.Commands.Results.LookupIdResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-505473531"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-831567827"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-505473531" class="accordion-body collapse in">
+            <div id="namespace-831567827" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1311087729"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-638624563"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1311087729" class="accordion-body collapse ">
+            <div id="namespace-638624563" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1206095742"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1026783552"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1206095742" class="accordion-body collapse ">
+            <div id="namespace-1026783552" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1281860133"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1805019230"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1281860133" class="accordion-body collapse ">
+            <div id="namespace-1805019230" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1702890343"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-208631153"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1702890343" class="accordion-body collapse ">
+            <div id="namespace-208631153" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1497031871"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-313506108"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1497031871" class="accordion-body collapse ">
+            <div id="namespace-313506108" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-60575562"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-553131738"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-60575562" class="accordion-body collapse ">
+            <div id="namespace-553131738" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-597365743"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2120232424"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-597365743" class="accordion-body collapse ">
+            <div id="namespace-2120232424" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1278266562"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-836625831"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1278266562" class="accordion-body collapse ">
+            <div id="namespace-836625831" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1313248411"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-644439809"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1313248411" class="accordion-body collapse ">
+            <div id="namespace-644439809" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-842922036"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1366392442"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-842922036" class="accordion-body collapse ">
+            <div id="namespace-1366392442" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2073389513"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-406920370"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-2073389513" class="accordion-body collapse ">
+            <div id="namespace-406920370" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-106905571"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-72439701"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-106905571" class="accordion-body collapse ">
+            <div id="namespace-72439701" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1825580836"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-774033467"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1825580836" class="accordion-body collapse ">
+            <div id="namespace-774033467" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.Results.Result.html b/docs/files/Threema.MsgApi.Commands.Results.Result.html
index f75ed68..6bbf811 100644
--- a/docs/files/Threema.MsgApi.Commands.Results.Result.html
+++ b/docs/files/Threema.MsgApi.Commands.Results.Result.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-743119030"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1683743261"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-743119030" class="accordion-body collapse in">
+            <div id="namespace-1683743261" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1855821796"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-712089400"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1855821796" class="accordion-body collapse ">
+            <div id="namespace-712089400" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-122150047"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-417736416"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-122150047" class="accordion-body collapse ">
+            <div id="namespace-417736416" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1030562913"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-124278863"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1030562913" class="accordion-body collapse ">
+            <div id="namespace-124278863" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-554162175"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-190728555"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-554162175" class="accordion-body collapse ">
+            <div id="namespace-190728555" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1901308221"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1430714459"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1901308221" class="accordion-body collapse ">
+            <div id="namespace-1430714459" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1092190347"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1761177229"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1092190347" class="accordion-body collapse ">
+            <div id="namespace-1761177229" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-806086030"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1955542005"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-806086030" class="accordion-body collapse ">
+            <div id="namespace-1955542005" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1153047617"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1734547929"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1153047617" class="accordion-body collapse ">
+            <div id="namespace-1734547929" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1643636607"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1292958688"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1643636607" class="accordion-body collapse ">
+            <div id="namespace-1292958688" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1287631"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1677177615"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1287631" class="accordion-body collapse ">
+            <div id="namespace-1677177615" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-937823370"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-307997347"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-937823370" class="accordion-body collapse ">
+            <div id="namespace-307997347" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1242330837"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1077862401"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1242330837" class="accordion-body collapse ">
+            <div id="namespace-1077862401" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1651900681"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-670634238"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1651900681" class="accordion-body collapse ">
+            <div id="namespace-670634238" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.Results.SendE2EResult.html b/docs/files/Threema.MsgApi.Commands.Results.SendE2EResult.html
index 0f1ea4e..6f65bbc 100644
--- a/docs/files/Threema.MsgApi.Commands.Results.SendE2EResult.html
+++ b/docs/files/Threema.MsgApi.Commands.Results.SendE2EResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-214235306"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-758270425"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-214235306" class="accordion-body collapse in">
+            <div id="namespace-758270425" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-123195269"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-419818335"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-123195269" class="accordion-body collapse ">
+            <div id="namespace-419818335" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-375652899"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1438817168"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-375652899" class="accordion-body collapse ">
+            <div id="namespace-1438817168" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-426759825"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-87528758"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-426759825" class="accordion-body collapse ">
+            <div id="namespace-87528758" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-98963682"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-993221140"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-98963682" class="accordion-body collapse ">
+            <div id="namespace-993221140" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1977320674"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1176286898"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1977320674" class="accordion-body collapse ">
+            <div id="namespace-1176286898" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-903310615"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-611882366"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-903310615" class="accordion-body collapse ">
+            <div id="namespace-611882366" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-984740284"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-467336793"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-984740284" class="accordion-body collapse ">
+            <div id="namespace-467336793" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-500199499"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-826359181"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-500199499" class="accordion-body collapse ">
+            <div id="namespace-826359181" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1179618620"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-580780592"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1179618620" class="accordion-body collapse ">
+            <div id="namespace-580780592" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-518175462"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-10253609"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-518175462" class="accordion-body collapse ">
+            <div id="namespace-10253609" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1918401312"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1461600468"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1918401312" class="accordion-body collapse ">
+            <div id="namespace-1461600468" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-765030276"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-488908013"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-765030276" class="accordion-body collapse ">
+            <div id="namespace-488908013" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1565901010"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1124257479"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1565901010" class="accordion-body collapse ">
+            <div id="namespace-1124257479" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.Results.SendSimpleResult.html b/docs/files/Threema.MsgApi.Commands.Results.SendSimpleResult.html
index 485032b..3510ad7 100644
--- a/docs/files/Threema.MsgApi.Commands.Results.SendSimpleResult.html
+++ b/docs/files/Threema.MsgApi.Commands.Results.SendSimpleResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-254759405"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1171440065"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-254759405" class="accordion-body collapse in">
+            <div id="namespace-1171440065" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-814166200"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1302773083"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-814166200" class="accordion-body collapse ">
+            <div id="namespace-1302773083" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1541303493"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2119673137"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1541303493" class="accordion-body collapse ">
+            <div id="namespace-2119673137" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-25789974"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1889003954"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-25789974" class="accordion-body collapse ">
+            <div id="namespace-1889003954" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-368868503"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-179120715"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-368868503" class="accordion-body collapse ">
+            <div id="namespace-179120715" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-447836838"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-304150349"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-447836838" class="accordion-body collapse ">
+            <div id="namespace-304150349" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-906268445"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1217189986"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-906268445" class="accordion-body collapse ">
+            <div id="namespace-1217189986" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1237630203"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-534554126"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1237630203" class="accordion-body collapse ">
+            <div id="namespace-534554126" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-184098466"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-854730440"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-184098466" class="accordion-body collapse ">
+            <div id="namespace-854730440" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2019568840"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-174971011"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-2019568840" class="accordion-body collapse ">
+            <div id="namespace-174971011" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1905907864"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-945802393"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1905907864" class="accordion-body collapse ">
+            <div id="namespace-945802393" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-384915005"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-350928511"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-384915005" class="accordion-body collapse ">
+            <div id="namespace-350928511" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1865524726"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-688808971"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1865524726" class="accordion-body collapse ">
+            <div id="namespace-688808971" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1481978834"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1427428927"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1481978834" class="accordion-body collapse ">
+            <div id="namespace-1427428927" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.Results.UploadFileResult.html b/docs/files/Threema.MsgApi.Commands.Results.UploadFileResult.html
index 6bd272a..e1778ba 100644
--- a/docs/files/Threema.MsgApi.Commands.Results.UploadFileResult.html
+++ b/docs/files/Threema.MsgApi.Commands.Results.UploadFileResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-402862699"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-771242720"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-402862699" class="accordion-body collapse in">
+            <div id="namespace-771242720" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1001304519"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1113602986"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1001304519" class="accordion-body collapse ">
+            <div id="namespace-1113602986" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-38470617"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-937379935"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-38470617" class="accordion-body collapse ">
+            <div id="namespace-937379935" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-285354942"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1824258157"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-285354942" class="accordion-body collapse ">
+            <div id="namespace-1824258157" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-913225355"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-457693142"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-913225355" class="accordion-body collapse ">
+            <div id="namespace-457693142" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-592995666"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1609604271"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-592995666" class="accordion-body collapse ">
+            <div id="namespace-1609604271" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-699384230"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1757992932"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-699384230" class="accordion-body collapse ">
+            <div id="namespace-1757992932" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1115035723"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1962318018"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1115035723" class="accordion-body collapse ">
+            <div id="namespace-1962318018" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-56798016"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1995350999"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-56798016" class="accordion-body collapse ">
+            <div id="namespace-1995350999" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-989121644"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-117892420"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-989121644" class="accordion-body collapse ">
+            <div id="namespace-117892420" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1947138054"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1831282070"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1947138054" class="accordion-body collapse ">
+            <div id="namespace-1831282070" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1452709650"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1356883770"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1452709650" class="accordion-body collapse ">
+            <div id="namespace-1356883770" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1882581484"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1400226054"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1882581484" class="accordion-body collapse ">
+            <div id="namespace-1400226054" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2133425035"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-459281290"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2133425035" class="accordion-body collapse ">
+            <div id="namespace-459281290" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.SendE2E.html b/docs/files/Threema.MsgApi.Commands.SendE2E.html
index d1019d1..be11e1b 100644
--- a/docs/files/Threema.MsgApi.Commands.SendE2E.html
+++ b/docs/files/Threema.MsgApi.Commands.SendE2E.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1844742891"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-752995068"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1844742891" class="accordion-body collapse in">
+            <div id="namespace-752995068" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1571683460"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1745239082"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1571683460" class="accordion-body collapse ">
+            <div id="namespace-1745239082" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-686737621"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1574684879"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-686737621" class="accordion-body collapse ">
+            <div id="namespace-1574684879" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-620729910"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-86221224"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-620729910" class="accordion-body collapse ">
+            <div id="namespace-86221224" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2073267787"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1911692856"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-2073267787" class="accordion-body collapse ">
+            <div id="namespace-1911692856" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1657247089"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-935859283"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1657247089" class="accordion-body collapse ">
+            <div id="namespace-935859283" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-328513833"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1970966044"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-328513833" class="accordion-body collapse ">
+            <div id="namespace-1970966044" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-600233571"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-364151378"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-600233571" class="accordion-body collapse ">
+            <div id="namespace-364151378" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-149812525"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-290984291"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-149812525" class="accordion-body collapse ">
+            <div id="namespace-290984291" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-696810027"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1975647256"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-696810027" class="accordion-body collapse ">
+            <div id="namespace-1975647256" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1637419213"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-461880007"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1637419213" class="accordion-body collapse ">
+            <div id="namespace-461880007" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1493179840"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1567697038"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1493179840" class="accordion-body collapse ">
+            <div id="namespace-1567697038" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-89396194"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1950651077"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-89396194" class="accordion-body collapse ">
+            <div id="namespace-1950651077" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-10498579"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1108248464"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-10498579" class="accordion-body collapse ">
+            <div id="namespace-1108248464" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.SendSimple.html b/docs/files/Threema.MsgApi.Commands.SendSimple.html
index e45a05e..f4330ec 100644
--- a/docs/files/Threema.MsgApi.Commands.SendSimple.html
+++ b/docs/files/Threema.MsgApi.Commands.SendSimple.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2094666510"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1965149182"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-2094666510" class="accordion-body collapse in">
+            <div id="namespace-1965149182" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1956883944"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2020546793"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1956883944" class="accordion-body collapse ">
+            <div id="namespace-2020546793" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-668849874"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-448993235"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-668849874" class="accordion-body collapse ">
+            <div id="namespace-448993235" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-695694147"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2129459895"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-695694147" class="accordion-body collapse ">
+            <div id="namespace-2129459895" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1751694686"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-809960242"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1751694686" class="accordion-body collapse ">
+            <div id="namespace-809960242" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1550057894"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1934801242"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1550057894" class="accordion-body collapse ">
+            <div id="namespace-1934801242" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1454907513"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1480605060"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1454907513" class="accordion-body collapse ">
+            <div id="namespace-1480605060" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1285900523"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1879975967"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1285900523" class="accordion-body collapse ">
+            <div id="namespace-1879975967" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1923548909"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-889446088"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1923548909" class="accordion-body collapse ">
+            <div id="namespace-889446088" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-460397160"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1593877276"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-460397160" class="accordion-body collapse ">
+            <div id="namespace-1593877276" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-746842643"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1986247892"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-746842643" class="accordion-body collapse ">
+            <div id="namespace-1986247892" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1143962681"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2118886979"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1143962681" class="accordion-body collapse ">
+            <div id="namespace-2118886979" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-317672380"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1410621990"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-317672380" class="accordion-body collapse ">
+            <div id="namespace-1410621990" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1105492073"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1980735356"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1105492073" class="accordion-body collapse ">
+            <div id="namespace-1980735356" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Commands.UploadFile.html b/docs/files/Threema.MsgApi.Commands.UploadFile.html
index 3f9f397..fe19755 100644
--- a/docs/files/Threema.MsgApi.Commands.UploadFile.html
+++ b/docs/files/Threema.MsgApi.Commands.UploadFile.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1883650446"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-923727559"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1883650446" class="accordion-body collapse in">
+            <div id="namespace-923727559" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1147675269"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1452048562"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1147675269" class="accordion-body collapse ">
+            <div id="namespace-1452048562" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1622746479"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1272141602"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1622746479" class="accordion-body collapse ">
+            <div id="namespace-1272141602" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1155960618"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-46763058"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1155960618" class="accordion-body collapse ">
+            <div id="namespace-46763058" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1082861919"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1768904514"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1082861919" class="accordion-body collapse ">
+            <div id="namespace-1768904514" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-177776401"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1895948720"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-177776401" class="accordion-body collapse ">
+            <div id="namespace-1895948720" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1749691503"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2082225985"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1749691503" class="accordion-body collapse ">
+            <div id="namespace-2082225985" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1935152190"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1130913743"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1935152190" class="accordion-body collapse ">
+            <div id="namespace-1130913743" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1059683275"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-788464713"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1059683275" class="accordion-body collapse ">
+            <div id="namespace-788464713" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1931137600"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1427342455"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1931137600" class="accordion-body collapse ">
+            <div id="namespace-1427342455" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-114687761"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-283558267"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-114687761" class="accordion-body collapse ">
+            <div id="namespace-283558267" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-32184085"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-427463769"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-32184085" class="accordion-body collapse ">
+            <div id="namespace-427463769" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1918595837"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1820640325"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1918595837" class="accordion-body collapse ">
+            <div id="namespace-1820640325" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-452959838"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-987709279"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-452959838" class="accordion-body collapse ">
+            <div id="namespace-987709279" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Connection.html b/docs/files/Threema.MsgApi.Connection.html
index f6091a6..8a0934d 100644
--- a/docs/files/Threema.MsgApi.Connection.html
+++ b/docs/files/Threema.MsgApi.Connection.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-503213484"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-507782016"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-503213484" class="accordion-body collapse in">
+            <div id="namespace-507782016" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2008994813"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2042802825"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-2008994813" class="accordion-body collapse ">
+            <div id="namespace-2042802825" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1847161589"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-826895955"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1847161589" class="accordion-body collapse ">
+            <div id="namespace-826895955" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-766714768"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1953997857"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-766714768" class="accordion-body collapse ">
+            <div id="namespace-1953997857" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1997825990"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1072921328"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1997825990" class="accordion-body collapse ">
+            <div id="namespace-1072921328" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2078426214"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-187379658"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-2078426214" class="accordion-body collapse ">
+            <div id="namespace-187379658" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-319236360"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1477871935"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-319236360" class="accordion-body collapse ">
+            <div id="namespace-1477871935" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1450978235"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1598317157"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1450978235" class="accordion-body collapse ">
+            <div id="namespace-1598317157" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-454811645"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-840240945"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-454811645" class="accordion-body collapse ">
+            <div id="namespace-840240945" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-660345515"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1703694890"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-660345515" class="accordion-body collapse ">
+            <div id="namespace-1703694890" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1390435526"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-425240760"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1390435526" class="accordion-body collapse ">
+            <div id="namespace-425240760" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-996274155"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-766549350"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-996274155" class="accordion-body collapse ">
+            <div id="namespace-766549350" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1117539115"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2013209357"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1117539115" class="accordion-body collapse ">
+            <div id="namespace-2013209357" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-552589165"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1397425535"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-552589165" class="accordion-body collapse ">
+            <div id="namespace-1397425535" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.ConnectionSettings.html b/docs/files/Threema.MsgApi.ConnectionSettings.html
index da64114..fe186ca 100644
--- a/docs/files/Threema.MsgApi.ConnectionSettings.html
+++ b/docs/files/Threema.MsgApi.ConnectionSettings.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2140217718"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1105789888"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-2140217718" class="accordion-body collapse in">
+            <div id="namespace-1105789888" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-224333333"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1797271882"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-224333333" class="accordion-body collapse ">
+            <div id="namespace-1797271882" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1407289212"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1445441451"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1407289212" class="accordion-body collapse ">
+            <div id="namespace-1445441451" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1253606348"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-789403856"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1253606348" class="accordion-body collapse ">
+            <div id="namespace-789403856" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1344725920"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1411778217"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1344725920" class="accordion-body collapse ">
+            <div id="namespace-1411778217" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-324625922"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-559980226"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-324625922" class="accordion-body collapse ">
+            <div id="namespace-559980226" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-884441563"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1341832949"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-884441563" class="accordion-body collapse ">
+            <div id="namespace-1341832949" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1310393961"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-772342453"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1310393961" class="accordion-body collapse ">
+            <div id="namespace-772342453" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2138104919"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-875030263"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-2138104919" class="accordion-body collapse ">
+            <div id="namespace-875030263" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1760263460"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-438527476"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1760263460" class="accordion-body collapse ">
+            <div id="namespace-438527476" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1650892378"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-436247302"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1650892378" class="accordion-body collapse ">
+            <div id="namespace-436247302" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-252780561"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1567490911"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-252780561" class="accordion-body collapse ">
+            <div id="namespace-1567490911" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1318579389"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-726796867"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1318579389" class="accordion-body collapse ">
+            <div id="namespace-726796867" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-944660485"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1503529405"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-944660485" class="accordion-body collapse ">
+            <div id="namespace-1503529405" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Constants.html b/docs/files/Threema.MsgApi.Constants.html
index 4513a43..8afc915 100644
--- a/docs/files/Threema.MsgApi.Constants.html
+++ b/docs/files/Threema.MsgApi.Constants.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1246210362"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1043684776"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1246210362" class="accordion-body collapse in">
+            <div id="namespace-1043684776" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1811530475"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-815671097"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1811530475" class="accordion-body collapse ">
+            <div id="namespace-815671097" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1074522307"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1797088841"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1074522307" class="accordion-body collapse ">
+            <div id="namespace-1797088841" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1247336028"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-287837672"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1247336028" class="accordion-body collapse ">
+            <div id="namespace-287837672" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2137295609"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-111315072"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-2137295609" class="accordion-body collapse ">
+            <div id="namespace-111315072" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-330040326"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-630251621"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-330040326" class="accordion-body collapse ">
+            <div id="namespace-630251621" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-391264032"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-110199557"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-391264032" class="accordion-body collapse ">
+            <div id="namespace-110199557" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-527380362"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1450599220"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-527380362" class="accordion-body collapse ">
+            <div id="namespace-1450599220" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1632547437"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1729604642"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1632547437" class="accordion-body collapse ">
+            <div id="namespace-1729604642" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1590371326"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1137982693"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1590371326" class="accordion-body collapse ">
+            <div id="namespace-1137982693" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1461669398"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1349781786"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1461669398" class="accordion-body collapse ">
+            <div id="namespace-1349781786" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1519024339"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-383698275"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1519024339" class="accordion-body collapse ">
+            <div id="namespace-383698275" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-578722610"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-666737102"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-578722610" class="accordion-body collapse ">
+            <div id="namespace-666737102" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1857970144"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1393940789"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1857970144" class="accordion-body collapse ">
+            <div id="namespace-1393940789" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Exceptions.BadMessageException.html b/docs/files/Threema.MsgApi.Exceptions.BadMessageException.html
index 1f4b21b..f1c1527 100644
--- a/docs/files/Threema.MsgApi.Exceptions.BadMessageException.html
+++ b/docs/files/Threema.MsgApi.Exceptions.BadMessageException.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-646484772"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-244180021"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-646484772" class="accordion-body collapse in">
+            <div id="namespace-244180021" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-53746644"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2037662640"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-53746644" class="accordion-body collapse ">
+            <div id="namespace-2037662640" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1176094467"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1695620755"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1176094467" class="accordion-body collapse ">
+            <div id="namespace-1695620755" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1457954207"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-600129338"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1457954207" class="accordion-body collapse ">
+            <div id="namespace-600129338" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1240926297"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-645105951"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1240926297" class="accordion-body collapse ">
+            <div id="namespace-645105951" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1335377664"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-182311087"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1335377664" class="accordion-body collapse ">
+            <div id="namespace-182311087" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1796666078"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1265760409"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1796666078" class="accordion-body collapse ">
+            <div id="namespace-1265760409" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2034795803"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1512727701"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-2034795803" class="accordion-body collapse ">
+            <div id="namespace-1512727701" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-384034163"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-27692901"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-384034163" class="accordion-body collapse ">
+            <div id="namespace-27692901" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1135177230"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1675546517"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1135177230" class="accordion-body collapse ">
+            <div id="namespace-1675546517" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-513368765"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-876592761"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-513368765" class="accordion-body collapse ">
+            <div id="namespace-876592761" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-687558990"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1696732681"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-687558990" class="accordion-body collapse ">
+            <div id="namespace-1696732681" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-278003916"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2024493614"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-278003916" class="accordion-body collapse ">
+            <div id="namespace-2024493614" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1239237463"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1310930042"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1239237463" class="accordion-body collapse ">
+            <div id="namespace-1310930042" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Exceptions.DecryptionFailedException.html b/docs/files/Threema.MsgApi.Exceptions.DecryptionFailedException.html
index f694454..fcc1cba 100644
--- a/docs/files/Threema.MsgApi.Exceptions.DecryptionFailedException.html
+++ b/docs/files/Threema.MsgApi.Exceptions.DecryptionFailedException.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1838372940"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-6927229"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1838372940" class="accordion-body collapse in">
+            <div id="namespace-6927229" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1944153313"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-79788030"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1944153313" class="accordion-body collapse ">
+            <div id="namespace-79788030" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-73890093"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-8366965"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-73890093" class="accordion-body collapse ">
+            <div id="namespace-8366965" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1572755610"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2024258989"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1572755610" class="accordion-body collapse ">
+            <div id="namespace-2024258989" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1297450818"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-106507124"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1297450818" class="accordion-body collapse ">
+            <div id="namespace-106507124" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-71321572"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1065639014"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-71321572" class="accordion-body collapse ">
+            <div id="namespace-1065639014" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-716937752"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-256708913"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-716937752" class="accordion-body collapse ">
+            <div id="namespace-256708913" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1826868403"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-897127898"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1826868403" class="accordion-body collapse ">
+            <div id="namespace-897127898" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1404847095"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-651940082"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1404847095" class="accordion-body collapse ">
+            <div id="namespace-651940082" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1038084354"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-828489407"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1038084354" class="accordion-body collapse ">
+            <div id="namespace-828489407" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1808665768"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1158888758"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1808665768" class="accordion-body collapse ">
+            <div id="namespace-1158888758" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-873319478"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2007906096"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-873319478" class="accordion-body collapse ">
+            <div id="namespace-2007906096" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1833313880"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-245145793"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1833313880" class="accordion-body collapse ">
+            <div id="namespace-245145793" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2039022169"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-475778342"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2039022169" class="accordion-body collapse ">
+            <div id="namespace-475778342" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Exceptions.InvalidArgumentException.html b/docs/files/Threema.MsgApi.Exceptions.InvalidArgumentException.html
index 3443fec..6c5451f 100644
--- a/docs/files/Threema.MsgApi.Exceptions.InvalidArgumentException.html
+++ b/docs/files/Threema.MsgApi.Exceptions.InvalidArgumentException.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-961498205"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1591661044"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-961498205" class="accordion-body collapse in">
+            <div id="namespace-1591661044" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2138106770"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1468819665"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-2138106770" class="accordion-body collapse ">
+            <div id="namespace-1468819665" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2100551637"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1316010889"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-2100551637" class="accordion-body collapse ">
+            <div id="namespace-1316010889" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-205552857"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-697494843"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-205552857" class="accordion-body collapse ">
+            <div id="namespace-697494843" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-898837397"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-314585817"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-898837397" class="accordion-body collapse ">
+            <div id="namespace-314585817" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-977163351"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-549309257"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-977163351" class="accordion-body collapse ">
+            <div id="namespace-549309257" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-943844688"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-84886973"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-943844688" class="accordion-body collapse ">
+            <div id="namespace-84886973" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1661701613"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1882084367"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1661701613" class="accordion-body collapse ">
+            <div id="namespace-1882084367" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-916740689"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-237500538"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-916740689" class="accordion-body collapse ">
+            <div id="namespace-237500538" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2147266335"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-666822880"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-2147266335" class="accordion-body collapse ">
+            <div id="namespace-666822880" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-991217039"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1061384175"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-991217039" class="accordion-body collapse ">
+            <div id="namespace-1061384175" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1606753654"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-648950910"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1606753654" class="accordion-body collapse ">
+            <div id="namespace-648950910" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1088590966"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-375867917"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1088590966" class="accordion-body collapse ">
+            <div id="namespace-375867917" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1685118858"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-978952557"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1685118858" class="accordion-body collapse ">
+            <div id="namespace-978952557" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Exceptions.UnsupportedMessageTypeException.html b/docs/files/Threema.MsgApi.Exceptions.UnsupportedMessageTypeException.html
index faba040..c67f199 100644
--- a/docs/files/Threema.MsgApi.Exceptions.UnsupportedMessageTypeException.html
+++ b/docs/files/Threema.MsgApi.Exceptions.UnsupportedMessageTypeException.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1599920356"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-342852866"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1599920356" class="accordion-body collapse in">
+            <div id="namespace-342852866" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1619866604"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-515323207"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1619866604" class="accordion-body collapse ">
+            <div id="namespace-515323207" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-313312918"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1338942161"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-313312918" class="accordion-body collapse ">
+            <div id="namespace-1338942161" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1359294393"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-702730607"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1359294393" class="accordion-body collapse ">
+            <div id="namespace-702730607" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1066211686"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1977561318"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1066211686" class="accordion-body collapse ">
+            <div id="namespace-1977561318" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1815531862"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1988956900"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1815531862" class="accordion-body collapse ">
+            <div id="namespace-1988956900" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1327653395"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-363446285"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1327653395" class="accordion-body collapse ">
+            <div id="namespace-363446285" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-712174777"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1284908439"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-712174777" class="accordion-body collapse ">
+            <div id="namespace-1284908439" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-272289819"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-228485613"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-272289819" class="accordion-body collapse ">
+            <div id="namespace-228485613" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1030536893"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2103772490"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1030536893" class="accordion-body collapse ">
+            <div id="namespace-2103772490" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-187629523"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-578479510"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-187629523" class="accordion-body collapse ">
+            <div id="namespace-578479510" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1822758779"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1865577425"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1822758779" class="accordion-body collapse ">
+            <div id="namespace-1865577425" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1672038979"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-391970950"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1672038979" class="accordion-body collapse ">
+            <div id="namespace-391970950" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-244321330"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-946221134"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-244321330" class="accordion-body collapse ">
+            <div id="namespace-946221134" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Helpers.E2EHelper.html b/docs/files/Threema.MsgApi.Helpers.E2EHelper.html
index 0b9612c..a82a5ad 100644
--- a/docs/files/Threema.MsgApi.Helpers.E2EHelper.html
+++ b/docs/files/Threema.MsgApi.Helpers.E2EHelper.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1492407367"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-768367828"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1492407367" class="accordion-body collapse in">
+            <div id="namespace-768367828" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2080401812"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1119404356"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-2080401812" class="accordion-body collapse ">
+            <div id="namespace-1119404356" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-271879313"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-719604665"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-271879313" class="accordion-body collapse ">
+            <div id="namespace-719604665" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-478855550"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1008233445"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-478855550" class="accordion-body collapse ">
+            <div id="namespace-1008233445" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-508179986"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1583399760"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-508179986" class="accordion-body collapse ">
+            <div id="namespace-1583399760" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2111243622"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-65244672"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-2111243622" class="accordion-body collapse ">
+            <div id="namespace-65244672" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1275011243"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1006024096"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1275011243" class="accordion-body collapse ">
+            <div id="namespace-1006024096" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-824166258"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-973769107"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-824166258" class="accordion-body collapse ">
+            <div id="namespace-973769107" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1293879435"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1219404226"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1293879435" class="accordion-body collapse ">
+            <div id="namespace-1219404226" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1714612670"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-212442331"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1714612670" class="accordion-body collapse ">
+            <div id="namespace-212442331" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-581413730"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1709736969"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-581413730" class="accordion-body collapse ">
+            <div id="namespace-1709736969" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1901182491"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-524332136"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1901182491" class="accordion-body collapse ">
+            <div id="namespace-524332136" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1987653739"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-276010192"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1987653739" class="accordion-body collapse ">
+            <div id="namespace-276010192" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1054225247"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-696851290"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1054225247" class="accordion-body collapse ">
+            <div id="namespace-696851290" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Helpers.ReceiveMessageResult.html b/docs/files/Threema.MsgApi.Helpers.ReceiveMessageResult.html
index de29765..0086b40 100644
--- a/docs/files/Threema.MsgApi.Helpers.ReceiveMessageResult.html
+++ b/docs/files/Threema.MsgApi.Helpers.ReceiveMessageResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1774666251"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-618042477"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1774666251" class="accordion-body collapse in">
+            <div id="namespace-618042477" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1380259881"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2118115914"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1380259881" class="accordion-body collapse ">
+            <div id="namespace-2118115914" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1275656675"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1317008292"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1275656675" class="accordion-body collapse ">
+            <div id="namespace-1317008292" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-651684709"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1803039426"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-651684709" class="accordion-body collapse ">
+            <div id="namespace-1803039426" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2048546854"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-192694756"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-2048546854" class="accordion-body collapse ">
+            <div id="namespace-192694756" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-272451721"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2036778026"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-272451721" class="accordion-body collapse ">
+            <div id="namespace-2036778026" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1392943272"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-968740250"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1392943272" class="accordion-body collapse ">
+            <div id="namespace-968740250" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-968620307"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-261537293"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-968620307" class="accordion-body collapse ">
+            <div id="namespace-261537293" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1230512631"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1798691279"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1230512631" class="accordion-body collapse ">
+            <div id="namespace-1798691279" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2020238033"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1959706844"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-2020238033" class="accordion-body collapse ">
+            <div id="namespace-1959706844" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1970925370"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-558053010"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1970925370" class="accordion-body collapse ">
+            <div id="namespace-558053010" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-158624851"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-828692307"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-158624851" class="accordion-body collapse ">
+            <div id="namespace-828692307" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1088504948"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1166383407"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1088504948" class="accordion-body collapse ">
+            <div id="namespace-1166383407" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-423577221"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-876379880"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-423577221" class="accordion-body collapse ">
+            <div id="namespace-876379880" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Messages.DeliveryReceipt.html b/docs/files/Threema.MsgApi.Messages.DeliveryReceipt.html
index d903b73..3b54756 100644
--- a/docs/files/Threema.MsgApi.Messages.DeliveryReceipt.html
+++ b/docs/files/Threema.MsgApi.Messages.DeliveryReceipt.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2072930899"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1433321338"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-2072930899" class="accordion-body collapse in">
+            <div id="namespace-1433321338" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1089620772"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-338700871"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1089620772" class="accordion-body collapse ">
+            <div id="namespace-338700871" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1073790347"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1613458148"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1073790347" class="accordion-body collapse ">
+            <div id="namespace-1613458148" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1767964907"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-593300562"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1767964907" class="accordion-body collapse ">
+            <div id="namespace-593300562" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-953227652"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-811985315"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-953227652" class="accordion-body collapse ">
+            <div id="namespace-811985315" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1960688587"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-827362622"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1960688587" class="accordion-body collapse ">
+            <div id="namespace-827362622" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-545163480"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-286465849"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-545163480" class="accordion-body collapse ">
+            <div id="namespace-286465849" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1779942681"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1158216994"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1779942681" class="accordion-body collapse ">
+            <div id="namespace-1158216994" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-334960446"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1355696873"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-334960446" class="accordion-body collapse ">
+            <div id="namespace-1355696873" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1993401468"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2097513948"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1993401468" class="accordion-body collapse ">
+            <div id="namespace-2097513948" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1332521053"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-539667373"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1332521053" class="accordion-body collapse ">
+            <div id="namespace-539667373" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1354062539"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-10584642"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1354062539" class="accordion-body collapse ">
+            <div id="namespace-10584642" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1859963213"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-527451275"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1859963213" class="accordion-body collapse ">
+            <div id="namespace-527451275" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-40128762"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1334663126"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-40128762" class="accordion-body collapse ">
+            <div id="namespace-1334663126" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Messages.FileMessage.html b/docs/files/Threema.MsgApi.Messages.FileMessage.html
index 78e3daf..9a7d42b 100644
--- a/docs/files/Threema.MsgApi.Messages.FileMessage.html
+++ b/docs/files/Threema.MsgApi.Messages.FileMessage.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1063792231"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2040495277"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1063792231" class="accordion-body collapse in">
+            <div id="namespace-2040495277" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1741106241"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1884700448"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1741106241" class="accordion-body collapse ">
+            <div id="namespace-1884700448" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1359353909"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-623909710"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1359353909" class="accordion-body collapse ">
+            <div id="namespace-623909710" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-978553589"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-627764957"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-978553589" class="accordion-body collapse ">
+            <div id="namespace-627764957" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1236770694"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1825621150"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1236770694" class="accordion-body collapse ">
+            <div id="namespace-1825621150" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-448502914"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1812441566"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-448502914" class="accordion-body collapse ">
+            <div id="namespace-1812441566" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-677660766"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1090418743"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-677660766" class="accordion-body collapse ">
+            <div id="namespace-1090418743" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1070602724"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-135142081"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1070602724" class="accordion-body collapse ">
+            <div id="namespace-135142081" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1174992621"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1304208637"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1174992621" class="accordion-body collapse ">
+            <div id="namespace-1304208637" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2008101098"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-20148312"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-2008101098" class="accordion-body collapse ">
+            <div id="namespace-20148312" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1899494377"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1508520491"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1899494377" class="accordion-body collapse ">
+            <div id="namespace-1508520491" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-463903417"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1850561462"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-463903417" class="accordion-body collapse ">
+            <div id="namespace-1850561462" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-399517714"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1762836560"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-399517714" class="accordion-body collapse ">
+            <div id="namespace-1762836560" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2146985860"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1175978982"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2146985860" class="accordion-body collapse ">
+            <div id="namespace-1175978982" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Messages.ImageMessage.html b/docs/files/Threema.MsgApi.Messages.ImageMessage.html
index 90485bb..012fe81 100644
--- a/docs/files/Threema.MsgApi.Messages.ImageMessage.html
+++ b/docs/files/Threema.MsgApi.Messages.ImageMessage.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1016992318"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1807318122"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1016992318" class="accordion-body collapse in">
+            <div id="namespace-1807318122" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-87074904"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1760485455"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-87074904" class="accordion-body collapse ">
+            <div id="namespace-1760485455" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1743206898"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1556140938"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1743206898" class="accordion-body collapse ">
+            <div id="namespace-1556140938" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1478995509"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-916921694"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1478995509" class="accordion-body collapse ">
+            <div id="namespace-916921694" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1331256256"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-862486038"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1331256256" class="accordion-body collapse ">
+            <div id="namespace-862486038" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-496568264"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1200901557"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-496568264" class="accordion-body collapse ">
+            <div id="namespace-1200901557" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1072559585"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1204178728"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1072559585" class="accordion-body collapse ">
+            <div id="namespace-1204178728" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-459840378"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-603603747"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-459840378" class="accordion-body collapse ">
+            <div id="namespace-603603747" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-341769074"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-341814620"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-341769074" class="accordion-body collapse ">
+            <div id="namespace-341814620" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1055509465"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1361255136"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1055509465" class="accordion-body collapse ">
+            <div id="namespace-1361255136" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1468403181"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2073796825"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1468403181" class="accordion-body collapse ">
+            <div id="namespace-2073796825" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1001919935"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-171555505"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1001919935" class="accordion-body collapse ">
+            <div id="namespace-171555505" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-904739604"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-998975331"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-904739604" class="accordion-body collapse ">
+            <div id="namespace-998975331" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-783401782"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-957488608"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-783401782" class="accordion-body collapse ">
+            <div id="namespace-957488608" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Messages.TextMessage.html b/docs/files/Threema.MsgApi.Messages.TextMessage.html
index ec08601..12b2cf1 100644
--- a/docs/files/Threema.MsgApi.Messages.TextMessage.html
+++ b/docs/files/Threema.MsgApi.Messages.TextMessage.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1298220683"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2014422187"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1298220683" class="accordion-body collapse in">
+            <div id="namespace-2014422187" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1643283352"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-613987517"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1643283352" class="accordion-body collapse ">
+            <div id="namespace-613987517" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1523254028"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2026908190"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1523254028" class="accordion-body collapse ">
+            <div id="namespace-2026908190" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1882623163"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-4930642"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1882623163" class="accordion-body collapse ">
+            <div id="namespace-4930642" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1878711132"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1114985421"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1878711132" class="accordion-body collapse ">
+            <div id="namespace-1114985421" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-176240583"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1374025343"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-176240583" class="accordion-body collapse ">
+            <div id="namespace-1374025343" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2000791907"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1920953006"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-2000791907" class="accordion-body collapse ">
+            <div id="namespace-1920953006" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-100338132"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1793074228"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-100338132" class="accordion-body collapse ">
+            <div id="namespace-1793074228" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-684020008"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-468136146"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-684020008" class="accordion-body collapse ">
+            <div id="namespace-468136146" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2096617144"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1915728355"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-2096617144" class="accordion-body collapse ">
+            <div id="namespace-1915728355" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-465769483"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1094800811"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-465769483" class="accordion-body collapse ">
+            <div id="namespace-1094800811" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2117577977"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-883847028"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-2117577977" class="accordion-body collapse ">
+            <div id="namespace-883847028" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1098348876"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1839889091"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1098348876" class="accordion-body collapse ">
+            <div id="namespace-1839889091" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-117935486"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1309032622"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-117935486" class="accordion-body collapse ">
+            <div id="namespace-1309032622" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Messages.ThreemaMessage.html b/docs/files/Threema.MsgApi.Messages.ThreemaMessage.html
index 971af76..4907f94 100644
--- a/docs/files/Threema.MsgApi.Messages.ThreemaMessage.html
+++ b/docs/files/Threema.MsgApi.Messages.ThreemaMessage.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-387767364"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1809722015"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-387767364" class="accordion-body collapse in">
+            <div id="namespace-1809722015" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2024764064"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-813491272"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-2024764064" class="accordion-body collapse ">
+            <div id="namespace-813491272" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1061115663"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-43702132"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1061115663" class="accordion-body collapse ">
+            <div id="namespace-43702132" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1667523926"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1216198666"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1667523926" class="accordion-body collapse ">
+            <div id="namespace-1216198666" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2102948719"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1127734323"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-2102948719" class="accordion-body collapse ">
+            <div id="namespace-1127734323" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1358971194"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-716196944"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1358971194" class="accordion-body collapse ">
+            <div id="namespace-716196944" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1951991018"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-717938823"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1951991018" class="accordion-body collapse ">
+            <div id="namespace-717938823" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-472336728"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-748149865"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-472336728" class="accordion-body collapse ">
+            <div id="namespace-748149865" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1391505016"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1328288238"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1391505016" class="accordion-body collapse ">
+            <div id="namespace-1328288238" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-864040781"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-985519737"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-864040781" class="accordion-body collapse ">
+            <div id="namespace-985519737" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1235641354"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2033569907"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1235641354" class="accordion-body collapse ">
+            <div id="namespace-2033569907" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1833667076"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-878679010"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1833667076" class="accordion-body collapse ">
+            <div id="namespace-878679010" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1442071329"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1576373242"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1442071329" class="accordion-body collapse ">
+            <div id="namespace-1576373242" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1045714633"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2131386306"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1045714633" class="accordion-body collapse ">
+            <div id="namespace-2131386306" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.PublicKeyStore.html b/docs/files/Threema.MsgApi.PublicKeyStore.html
index 2da52e5..17d982b 100644
--- a/docs/files/Threema.MsgApi.PublicKeyStore.html
+++ b/docs/files/Threema.MsgApi.PublicKeyStore.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1115608821"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-797863063"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1115608821" class="accordion-body collapse in">
+            <div id="namespace-797863063" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-192093204"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1173472705"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-192093204" class="accordion-body collapse ">
+            <div id="namespace-1173472705" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1481525747"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-381574086"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1481525747" class="accordion-body collapse ">
+            <div id="namespace-381574086" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1172336391"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-978384237"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1172336391" class="accordion-body collapse ">
+            <div id="namespace-978384237" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1473663923"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2059454795"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1473663923" class="accordion-body collapse ">
+            <div id="namespace-2059454795" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-370535180"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1479888931"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-370535180" class="accordion-body collapse ">
+            <div id="namespace-1479888931" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1466477804"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-645305227"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1466477804" class="accordion-body collapse ">
+            <div id="namespace-645305227" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-648487614"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1960139206"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-648487614" class="accordion-body collapse ">
+            <div id="namespace-1960139206" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-825571199"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-857826827"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-825571199" class="accordion-body collapse ">
+            <div id="namespace-857826827" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-709933542"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-375614474"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-709933542" class="accordion-body collapse ">
+            <div id="namespace-375614474" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-656669372"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1997794926"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-656669372" class="accordion-body collapse ">
+            <div id="namespace-1997794926" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1363047711"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1004858340"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1363047711" class="accordion-body collapse ">
+            <div id="namespace-1004858340" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1925619261"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1285024370"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1925619261" class="accordion-body collapse ">
+            <div id="namespace-1285024370" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-276990123"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1122196069"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-276990123" class="accordion-body collapse ">
+            <div id="namespace-1122196069" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -564,7 +564,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.PublicKeyStores.File.html b/docs/files/Threema.MsgApi.PublicKeyStores.File.html
index 5044c7e..7529441 100644
--- a/docs/files/Threema.MsgApi.PublicKeyStores.File.html
+++ b/docs/files/Threema.MsgApi.PublicKeyStores.File.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1836918587"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-267564807"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1836918587" class="accordion-body collapse in">
+            <div id="namespace-267564807" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1921113354"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1459002895"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1921113354" class="accordion-body collapse ">
+            <div id="namespace-1459002895" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-24935437"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1816644308"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-24935437" class="accordion-body collapse ">
+            <div id="namespace-1816644308" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1844077801"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-419554613"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1844077801" class="accordion-body collapse ">
+            <div id="namespace-419554613" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2045303905"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1925079359"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-2045303905" class="accordion-body collapse ">
+            <div id="namespace-1925079359" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1506189024"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1971224117"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1506189024" class="accordion-body collapse ">
+            <div id="namespace-1971224117" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1843759602"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-678828566"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1843759602" class="accordion-body collapse ">
+            <div id="namespace-678828566" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1956170937"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2123936983"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1956170937" class="accordion-body collapse ">
+            <div id="namespace-2123936983" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-587848178"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-168491844"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-587848178" class="accordion-body collapse ">
+            <div id="namespace-168491844" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-646842216"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1351381873"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-646842216" class="accordion-body collapse ">
+            <div id="namespace-1351381873" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1621552978"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-882619626"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1621552978" class="accordion-body collapse ">
+            <div id="namespace-882619626" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1978285458"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2017632949"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1978285458" class="accordion-body collapse ">
+            <div id="namespace-2017632949" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-611214913"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-644968563"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-611214913" class="accordion-body collapse ">
+            <div id="namespace-644968563" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-46051227"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-464129100"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-46051227" class="accordion-body collapse ">
+            <div id="namespace-464129100" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.PublicKeyStores.PhpFile.html b/docs/files/Threema.MsgApi.PublicKeyStores.PhpFile.html
index f0ed1a9..a5e254c 100644
--- a/docs/files/Threema.MsgApi.PublicKeyStores.PhpFile.html
+++ b/docs/files/Threema.MsgApi.PublicKeyStores.PhpFile.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-686872455"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1221416886"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-686872455" class="accordion-body collapse in">
+            <div id="namespace-1221416886" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1473635833"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-434410495"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1473635833" class="accordion-body collapse ">
+            <div id="namespace-434410495" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-34778194"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1711398359"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-34778194" class="accordion-body collapse ">
+            <div id="namespace-1711398359" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1339112913"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-516441791"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1339112913" class="accordion-body collapse ">
+            <div id="namespace-516441791" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-966141345"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1276750392"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-966141345" class="accordion-body collapse ">
+            <div id="namespace-1276750392" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1090587102"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1205239340"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1090587102" class="accordion-body collapse ">
+            <div id="namespace-1205239340" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-882858519"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-534845076"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-882858519" class="accordion-body collapse ">
+            <div id="namespace-534845076" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1028659454"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1368318425"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1028659454" class="accordion-body collapse ">
+            <div id="namespace-1368318425" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-819983322"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1615932191"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-819983322" class="accordion-body collapse ">
+            <div id="namespace-1615932191" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-867267739"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1445817129"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-867267739" class="accordion-body collapse ">
+            <div id="namespace-1445817129" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1816663687"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1342738497"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1816663687" class="accordion-body collapse ">
+            <div id="namespace-1342738497" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-900516394"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-764683282"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-900516394" class="accordion-body collapse ">
+            <div id="namespace-764683282" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-989241610"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1182742585"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-989241610" class="accordion-body collapse ">
+            <div id="namespace-1182742585" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-439647462"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-942663809"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-439647462" class="accordion-body collapse ">
+            <div id="namespace-942663809" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Receiver.html b/docs/files/Threema.MsgApi.Receiver.html
index 988bde7..1c1d75d 100644
--- a/docs/files/Threema.MsgApi.Receiver.html
+++ b/docs/files/Threema.MsgApi.Receiver.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1159981100"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-157589022"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1159981100" class="accordion-body collapse in">
+            <div id="namespace-157589022" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-857409618"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2139449067"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-857409618" class="accordion-body collapse ">
+            <div id="namespace-2139449067" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1386279024"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1683829403"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1386279024" class="accordion-body collapse ">
+            <div id="namespace-1683829403" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-765541662"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1023505278"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-765541662" class="accordion-body collapse ">
+            <div id="namespace-1023505278" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-55218373"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-818135683"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-55218373" class="accordion-body collapse ">
+            <div id="namespace-818135683" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1681639213"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1920631342"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1681639213" class="accordion-body collapse ">
+            <div id="namespace-1920631342" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-837033831"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1275810182"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-837033831" class="accordion-body collapse ">
+            <div id="namespace-1275810182" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-283145502"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-758027801"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-283145502" class="accordion-body collapse ">
+            <div id="namespace-758027801" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1163271124"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-399564688"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1163271124" class="accordion-body collapse ">
+            <div id="namespace-399564688" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1074310858"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-394100556"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1074310858" class="accordion-body collapse ">
+            <div id="namespace-394100556" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-43153850"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1379908285"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-43153850" class="accordion-body collapse ">
+            <div id="namespace-1379908285" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-663338466"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1066060271"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-663338466" class="accordion-body collapse ">
+            <div id="namespace-1066060271" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2100417806"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1661866614"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2100417806" class="accordion-body collapse ">
+            <div id="namespace-1661866614" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1638340244"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-788166449"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1638340244" class="accordion-body collapse ">
+            <div id="namespace-788166449" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Tests.CommonTests.html b/docs/files/Threema.MsgApi.Tests.CommonTests.html
index 978b2c3..e7295d0 100644
--- a/docs/files/Threema.MsgApi.Tests.CommonTests.html
+++ b/docs/files/Threema.MsgApi.Tests.CommonTests.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-110711319"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1940632808"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-110711319" class="accordion-body collapse in">
+            <div id="namespace-1940632808" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1951538699"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-735681870"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1951538699" class="accordion-body collapse ">
+            <div id="namespace-735681870" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1649526109"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-943030962"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1649526109" class="accordion-body collapse ">
+            <div id="namespace-943030962" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1131049740"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1745541294"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1131049740" class="accordion-body collapse ">
+            <div id="namespace-1745541294" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-186067692"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1227427402"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-186067692" class="accordion-body collapse ">
+            <div id="namespace-1227427402" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1860458323"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1188550988"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1860458323" class="accordion-body collapse ">
+            <div id="namespace-1188550988" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1782145401"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1408355159"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1782145401" class="accordion-body collapse ">
+            <div id="namespace-1408355159" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-903610197"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-70586197"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-903610197" class="accordion-body collapse ">
+            <div id="namespace-70586197" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-739920113"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-21490886"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-739920113" class="accordion-body collapse ">
+            <div id="namespace-21490886" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1161953929"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1691996323"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1161953929" class="accordion-body collapse ">
+            <div id="namespace-1691996323" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-493750607"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1352930878"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-493750607" class="accordion-body collapse ">
+            <div id="namespace-1352930878" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1458079604"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1286759115"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1458079604" class="accordion-body collapse ">
+            <div id="namespace-1286759115" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1411531978"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-548091963"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1411531978" class="accordion-body collapse ">
+            <div id="namespace-548091963" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1907760981"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1766144325"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1907760981" class="accordion-body collapse ">
+            <div id="namespace-1766144325" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Tests.Constants.html b/docs/files/Threema.MsgApi.Tests.Constants.html
index 2c196a0..266f018 100644
--- a/docs/files/Threema.MsgApi.Tests.Constants.html
+++ b/docs/files/Threema.MsgApi.Tests.Constants.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1069418263"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-436831242"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1069418263" class="accordion-body collapse in">
+            <div id="namespace-436831242" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1454384962"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1812532665"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1454384962" class="accordion-body collapse ">
+            <div id="namespace-1812532665" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2054648345"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-374227411"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-2054648345" class="accordion-body collapse ">
+            <div id="namespace-374227411" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-545782521"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1505377961"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-545782521" class="accordion-body collapse ">
+            <div id="namespace-1505377961" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-936009386"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1740454848"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-936009386" class="accordion-body collapse ">
+            <div id="namespace-1740454848" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-676660475"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1785945352"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-676660475" class="accordion-body collapse ">
+            <div id="namespace-1785945352" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-158564183"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-254833598"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-158564183" class="accordion-body collapse ">
+            <div id="namespace-254833598" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1060630482"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1959645703"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1060630482" class="accordion-body collapse ">
+            <div id="namespace-1959645703" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-903868923"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1191080642"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-903868923" class="accordion-body collapse ">
+            <div id="namespace-1191080642" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1478500800"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1805595977"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1478500800" class="accordion-body collapse ">
+            <div id="namespace-1805595977" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1481744514"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-521956313"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1481744514" class="accordion-body collapse ">
+            <div id="namespace-521956313" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1473098039"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1170895994"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1473098039" class="accordion-body collapse ">
+            <div id="namespace-1170895994" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1687744742"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-928650307"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1687744742" class="accordion-body collapse ">
+            <div id="namespace-928650307" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2080464641"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2137808143"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2080464641" class="accordion-body collapse ">
+            <div id="namespace-2137808143" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Tests.CryptToolTest.html b/docs/files/Threema.MsgApi.Tests.CryptToolTest.html
index 264e4d4..e643f47 100644
--- a/docs/files/Threema.MsgApi.Tests.CryptToolTest.html
+++ b/docs/files/Threema.MsgApi.Tests.CryptToolTest.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1748256786"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1659117031"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1748256786" class="accordion-body collapse in">
+            <div id="namespace-1659117031" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-379400737"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1917973278"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-379400737" class="accordion-body collapse ">
+            <div id="namespace-1917973278" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-439847716"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1593488202"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-439847716" class="accordion-body collapse ">
+            <div id="namespace-1593488202" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-444722004"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-904991218"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-444722004" class="accordion-body collapse ">
+            <div id="namespace-904991218" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-794194483"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-606503760"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-794194483" class="accordion-body collapse ">
+            <div id="namespace-606503760" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1101344085"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-124738572"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1101344085" class="accordion-body collapse ">
+            <div id="namespace-124738572" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1426198790"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-973184020"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1426198790" class="accordion-body collapse ">
+            <div id="namespace-973184020" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-247639542"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1165461831"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-247639542" class="accordion-body collapse ">
+            <div id="namespace-1165461831" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1692233672"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2026599638"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1692233672" class="accordion-body collapse ">
+            <div id="namespace-2026599638" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1893700292"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-203531411"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1893700292" class="accordion-body collapse ">
+            <div id="namespace-203531411" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-392411455"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-353849398"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-392411455" class="accordion-body collapse ">
+            <div id="namespace-353849398" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-360272737"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1376701184"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-360272737" class="accordion-body collapse ">
+            <div id="namespace-1376701184" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-466203284"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-990269491"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-466203284" class="accordion-body collapse ">
+            <div id="namespace-990269491" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1337725457"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1353276751"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1337725457" class="accordion-body collapse ">
+            <div id="namespace-1353276751" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Tools.CryptTool.html b/docs/files/Threema.MsgApi.Tools.CryptTool.html
index abc2ed8..0e8c754 100644
--- a/docs/files/Threema.MsgApi.Tools.CryptTool.html
+++ b/docs/files/Threema.MsgApi.Tools.CryptTool.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1954769788"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1346797441"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1954769788" class="accordion-body collapse in">
+            <div id="namespace-1346797441" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-77892084"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1719909159"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-77892084" class="accordion-body collapse ">
+            <div id="namespace-1719909159" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1917968874"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2022423100"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1917968874" class="accordion-body collapse ">
+            <div id="namespace-2022423100" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1274669796"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-769579438"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1274669796" class="accordion-body collapse ">
+            <div id="namespace-769579438" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-745448982"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-64095129"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-745448982" class="accordion-body collapse ">
+            <div id="namespace-64095129" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-19695040"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2161464"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-19695040" class="accordion-body collapse ">
+            <div id="namespace-2161464" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-454297749"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1540198650"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-454297749" class="accordion-body collapse ">
+            <div id="namespace-1540198650" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-786596572"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-876178153"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-786596572" class="accordion-body collapse ">
+            <div id="namespace-876178153" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2019050364"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-475065067"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-2019050364" class="accordion-body collapse ">
+            <div id="namespace-475065067" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-906248173"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-823574578"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-906248173" class="accordion-body collapse ">
+            <div id="namespace-823574578" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-632131765"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-196555021"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-632131765" class="accordion-body collapse ">
+            <div id="namespace-196555021" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-973157930"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-97027064"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-973157930" class="accordion-body collapse ">
+            <div id="namespace-97027064" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2107570302"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1666521837"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2107570302" class="accordion-body collapse ">
+            <div id="namespace-1666521837" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2009478915"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-971602516"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2009478915" class="accordion-body collapse ">
+            <div id="namespace-971602516" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -564,7 +564,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Tools.CryptToolSalt.html b/docs/files/Threema.MsgApi.Tools.CryptToolSalt.html
index ccdb957..0ae04df 100644
--- a/docs/files/Threema.MsgApi.Tools.CryptToolSalt.html
+++ b/docs/files/Threema.MsgApi.Tools.CryptToolSalt.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-672513213"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1348766561"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-672513213" class="accordion-body collapse in">
+            <div id="namespace-1348766561" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-477260370"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-892197652"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-477260370" class="accordion-body collapse ">
+            <div id="namespace-892197652" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1255549489"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-26043717"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1255549489" class="accordion-body collapse ">
+            <div id="namespace-26043717" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2004758791"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1126123317"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-2004758791" class="accordion-body collapse ">
+            <div id="namespace-1126123317" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1485922965"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1066060509"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1485922965" class="accordion-body collapse ">
+            <div id="namespace-1066060509" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1289968873"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-786564086"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1289968873" class="accordion-body collapse ">
+            <div id="namespace-786564086" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-954950791"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-824614617"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-954950791" class="accordion-body collapse ">
+            <div id="namespace-824614617" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-400905717"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1630932460"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-400905717" class="accordion-body collapse ">
+            <div id="namespace-1630932460" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2028078514"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1758544736"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-2028078514" class="accordion-body collapse ">
+            <div id="namespace-1758544736" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-455572801"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1622294430"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-455572801" class="accordion-body collapse ">
+            <div id="namespace-1622294430" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1755987985"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-174164817"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1755987985" class="accordion-body collapse ">
+            <div id="namespace-174164817" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-916560225"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2037343628"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-916560225" class="accordion-body collapse ">
+            <div id="namespace-2037343628" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-826453275"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-904239378"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-826453275" class="accordion-body collapse ">
+            <div id="namespace-904239378" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-424913972"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-633229316"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-424913972" class="accordion-body collapse ">
+            <div id="namespace-633229316" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Tools.CryptToolSodium.html b/docs/files/Threema.MsgApi.Tools.CryptToolSodium.html
index ad95afb..44d8eac 100644
--- a/docs/files/Threema.MsgApi.Tools.CryptToolSodium.html
+++ b/docs/files/Threema.MsgApi.Tools.CryptToolSodium.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-987835567"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-706736725"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-987835567" class="accordion-body collapse in">
+            <div id="namespace-706736725" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1077189511"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2114315943"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1077189511" class="accordion-body collapse ">
+            <div id="namespace-2114315943" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1077523928"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1602952391"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1077523928" class="accordion-body collapse ">
+            <div id="namespace-1602952391" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2031135933"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-846473245"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-2031135933" class="accordion-body collapse ">
+            <div id="namespace-846473245" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2091072927"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-733423128"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-2091072927" class="accordion-body collapse ">
+            <div id="namespace-733423128" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1392934377"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-669984708"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1392934377" class="accordion-body collapse ">
+            <div id="namespace-669984708" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-863863088"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-732108116"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-863863088" class="accordion-body collapse ">
+            <div id="namespace-732108116" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1663996379"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1503176953"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1663996379" class="accordion-body collapse ">
+            <div id="namespace-1503176953" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1929414731"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1357365912"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1929414731" class="accordion-body collapse ">
+            <div id="namespace-1357365912" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1559778461"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-405238263"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1559778461" class="accordion-body collapse ">
+            <div id="namespace-405238263" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1705150557"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-608744921"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1705150557" class="accordion-body collapse ">
+            <div id="namespace-608744921" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2082304202"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-412145683"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-2082304202" class="accordion-body collapse ">
+            <div id="namespace-412145683" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1968268285"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-764074470"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1968268285" class="accordion-body collapse ">
+            <div id="namespace-764074470" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1845307983"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-253767116"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1845307983" class="accordion-body collapse ">
+            <div id="namespace-253767116" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Tools.CryptToolSodiumDep.html b/docs/files/Threema.MsgApi.Tools.CryptToolSodiumDep.html
index aa0d893..e908d26 100644
--- a/docs/files/Threema.MsgApi.Tools.CryptToolSodiumDep.html
+++ b/docs/files/Threema.MsgApi.Tools.CryptToolSodiumDep.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-343946881"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-675865426"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-343946881" class="accordion-body collapse in">
+            <div id="namespace-675865426" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-28858244"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1254794127"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-28858244" class="accordion-body collapse ">
+            <div id="namespace-1254794127" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1273632606"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-274953399"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1273632606" class="accordion-body collapse ">
+            <div id="namespace-274953399" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1465926633"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-389800390"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1465926633" class="accordion-body collapse ">
+            <div id="namespace-389800390" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2062928205"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1952836804"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-2062928205" class="accordion-body collapse ">
+            <div id="namespace-1952836804" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-772013216"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-463331656"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-772013216" class="accordion-body collapse ">
+            <div id="namespace-463331656" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-92538162"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-136887051"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-92538162" class="accordion-body collapse ">
+            <div id="namespace-136887051" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-751659663"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1133548577"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-751659663" class="accordion-body collapse ">
+            <div id="namespace-1133548577" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2056743450"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1852700993"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-2056743450" class="accordion-body collapse ">
+            <div id="namespace-1852700993" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-536182836"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-972425165"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-536182836" class="accordion-body collapse ">
+            <div id="namespace-972425165" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-233621383"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-64787180"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-233621383" class="accordion-body collapse ">
+            <div id="namespace-64787180" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1947317872"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1441966915"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1947317872" class="accordion-body collapse ">
+            <div id="namespace-1441966915" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-799984901"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1975101206"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-799984901" class="accordion-body collapse ">
+            <div id="namespace-1975101206" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-249195552"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1309538979"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-249195552" class="accordion-body collapse ">
+            <div id="namespace-1309538979" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Tools.EncryptResult.html b/docs/files/Threema.MsgApi.Tools.EncryptResult.html
index aa05369..f370c93 100644
--- a/docs/files/Threema.MsgApi.Tools.EncryptResult.html
+++ b/docs/files/Threema.MsgApi.Tools.EncryptResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-705093614"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-408017236"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-705093614" class="accordion-body collapse in">
+            <div id="namespace-408017236" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1328398376"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1848756943"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1328398376" class="accordion-body collapse ">
+            <div id="namespace-1848756943" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-971391526"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1539032111"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-971391526" class="accordion-body collapse ">
+            <div id="namespace-1539032111" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-434602850"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1868358840"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-434602850" class="accordion-body collapse ">
+            <div id="namespace-1868358840" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1883054866"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-779542852"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1883054866" class="accordion-body collapse ">
+            <div id="namespace-779542852" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1669567459"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1971987161"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1669567459" class="accordion-body collapse ">
+            <div id="namespace-1971987161" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-210486342"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-692440746"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-210486342" class="accordion-body collapse ">
+            <div id="namespace-692440746" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1164758706"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-692813254"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1164758706" class="accordion-body collapse ">
+            <div id="namespace-692813254" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1687660856"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-152927276"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1687660856" class="accordion-body collapse ">
+            <div id="namespace-152927276" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-394393282"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-608357663"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-394393282" class="accordion-body collapse ">
+            <div id="namespace-608357663" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-72946391"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1756997645"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-72946391" class="accordion-body collapse ">
+            <div id="namespace-1756997645" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1350932670"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1572809401"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1350932670" class="accordion-body collapse ">
+            <div id="namespace-1572809401" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1366720268"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-887022095"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1366720268" class="accordion-body collapse ">
+            <div id="namespace-887022095" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-424942773"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1729827656"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-424942773" class="accordion-body collapse ">
+            <div id="namespace-1729827656" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Tools.FileAnalysisResult.html b/docs/files/Threema.MsgApi.Tools.FileAnalysisResult.html
index 758f0fb..1cbbfd8 100644
--- a/docs/files/Threema.MsgApi.Tools.FileAnalysisResult.html
+++ b/docs/files/Threema.MsgApi.Tools.FileAnalysisResult.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-797895154"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1847321579"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-797895154" class="accordion-body collapse in">
+            <div id="namespace-1847321579" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1277482496"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-741001717"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1277482496" class="accordion-body collapse ">
+            <div id="namespace-741001717" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2041670089"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2036510740"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-2041670089" class="accordion-body collapse ">
+            <div id="namespace-2036510740" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-526245338"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1265286931"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-526245338" class="accordion-body collapse ">
+            <div id="namespace-1265286931" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-992285671"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1516369482"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-992285671" class="accordion-body collapse ">
+            <div id="namespace-1516369482" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1438375782"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-661473287"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1438375782" class="accordion-body collapse ">
+            <div id="namespace-661473287" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-498043511"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1477711392"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-498043511" class="accordion-body collapse ">
+            <div id="namespace-1477711392" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1773359719"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-277365736"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1773359719" class="accordion-body collapse ">
+            <div id="namespace-277365736" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1198583814"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-466042312"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1198583814" class="accordion-body collapse ">
+            <div id="namespace-466042312" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1878083648"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-820095614"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1878083648" class="accordion-body collapse ">
+            <div id="namespace-820095614" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1062525327"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2025658483"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1062525327" class="accordion-body collapse ">
+            <div id="namespace-2025658483" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1154866254"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1059681912"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1154866254" class="accordion-body collapse ">
+            <div id="namespace-1059681912" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-539213964"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-928205427"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-539213964" class="accordion-body collapse ">
+            <div id="namespace-928205427" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1078893879"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-410322575"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1078893879" class="accordion-body collapse ">
+            <div id="namespace-410322575" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema.MsgApi.Tools.FileAnalysisTool.html b/docs/files/Threema.MsgApi.Tools.FileAnalysisTool.html
index 5677404..4546ab8 100644
--- a/docs/files/Threema.MsgApi.Tools.FileAnalysisTool.html
+++ b/docs/files/Threema.MsgApi.Tools.FileAnalysisTool.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1470989951"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1225826961"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1470989951" class="accordion-body collapse in">
+            <div id="namespace-1225826961" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2057028815"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-15174954"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-2057028815" class="accordion-body collapse ">
+            <div id="namespace-15174954" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1911480403"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-708250174"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1911480403" class="accordion-body collapse ">
+            <div id="namespace-708250174" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2129395854"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-491223149"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-2129395854" class="accordion-body collapse ">
+            <div id="namespace-491223149" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-814616773"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2143682491"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-814616773" class="accordion-body collapse ">
+            <div id="namespace-2143682491" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1390201892"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-233355694"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1390201892" class="accordion-body collapse ">
+            <div id="namespace-233355694" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1109491483"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-739210841"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1109491483" class="accordion-body collapse ">
+            <div id="namespace-739210841" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1201969992"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-54702939"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1201969992" class="accordion-body collapse ">
+            <div id="namespace-54702939" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1058883556"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-183511044"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1058883556" class="accordion-body collapse ">
+            <div id="namespace-183511044" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-621992905"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2025781303"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-621992905" class="accordion-body collapse ">
+            <div id="namespace-2025781303" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1652398401"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1426555751"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1652398401" class="accordion-body collapse ">
+            <div id="namespace-1426555751" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-944702958"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1047102535"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-944702958" class="accordion-body collapse ">
+            <div id="namespace-1047102535" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-623262523"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-899272183"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-623262523" class="accordion-body collapse ">
+            <div id="namespace-899272183" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1808310508"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-122793192"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1808310508" class="accordion-body collapse ">
+            <div id="namespace-122793192" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -563,7 +563,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Threema/MsgApi/Helpers/E2EHelper.php.txt b/docs/files/Threema/MsgApi/Helpers/E2EHelper.php.txt
index c44cdc7..50d3a6e 100644
--- a/docs/files/Threema/MsgApi/Helpers/E2EHelper.php.txt
+++ b/docs/files/Threema/MsgApi/Helpers/E2EHelper.php.txt
@@ -11,6 +11,7 @@ use Threema\MsgApi\Commands\Results\CapabilityResult;
 use Threema\MsgApi\Connection;
 use Threema\MsgApi\Messages\FileMessage;
 use Threema\MsgApi\Messages\ImageMessage;
+use Threema\MsgApi\Messages\ThreemaMessage;
 use Threema\MsgApi\Tools\CryptTool;
 use Threema\Core\Exception;
 use Threema\MsgApi\Tools\FileAnalysisTool;
@@ -178,6 +179,7 @@ class E2EHelper {
 		return $this->connection->sendE2E($threemaId, $nonce, $fileMessage);
 	}
 
+
 	/**
 	 * Encrypt a message and download the files of the message to the $outputFolder
 	 *
@@ -186,10 +188,19 @@ class E2EHelper {
 	 * @param string $box box as binary string
 	 * @param string $nonce nonce as binary string
 	 * @param string|null $outputFolder folder for storing the files
-	 * @throws \Threema\Core\Exception
+	 * @param \Closure $downloadMessage
 	 * @return ReceiveMessageResult
+	 * @throws Exception
+	 * @throws \Threema\MsgApi\Exceptions\BadMessageException
+	 * @throws \Threema\MsgApi\Exceptions\DecryptionFailedException
+	 * @throws \Threema\MsgApi\Exceptions\UnsupportedMessageTypeException
 	 */
-	public final function receiveMessage($threemaId, $messageId, $box, $nonce, $outputFolder = null) {
+	public final function receiveMessage($threemaId,
+										 $messageId,
+										 $box,
+										 $nonce,
+										 $outputFolder = null,
+										 \Closure $downloadMessage = null) {
 
 		if($outputFolder == null || strlen($outputFolder) == 0) {
 			$outputFolder = '.';
@@ -216,51 +227,48 @@ class E2EHelper {
 		$receiveResult = new ReceiveMessageResult($messageId, $message);
 
 		if($message instanceof ImageMessage) {
-			$result = $this->connection->downloadFile($message->getBlobId());
-			if(null === $result || false === $result->isSuccess()) {
-				throw new Exception('could not download the image with blob id '.$message->getBlobId());
-			}
-
-			$image = $this->cryptTool->decryptImage(
-				$result->getData(),
-				hex2bin($receiverPublicKey->getPublicKey()),
-				$this->privateKey,
-				$message->getNonce()
-			);
+			$result = $this->downloadFile($message, $message->getBlobId(), $downloadMessage);
+			if(null !== $result && true === $result->isSuccess()) {
+				$image = $this->cryptTool->decryptImage(
+					$result->getData(),
+					hex2bin($receiverPublicKey->getPublicKey()),
+					$this->privateKey,
+					$message->getNonce()
+				);
+
+				if (null === $image) {
+					throw new Exception('decryption of image failed');
+				}
+				//save file
+				$filePath = $outputFolder . '/' . $messageId . '.jpg';
+				$f = fopen($filePath, 'w+');
+				fwrite($f, $image);
+				fclose($f);
 
-			if(null === $image) {
-				throw new Exception('decryption of image failed');
+				$receiveResult->addFile('image', $filePath);
 			}
-			//save file
-			$filePath = $outputFolder.'/'.$messageId.'.jpg';
-			$f = fopen($filePath, 'w+');
-			fwrite($f, $image);
-			fclose($f);
-
-			$receiveResult->addFile('image', $filePath);
 		}
 		else if($message instanceof FileMessage) {
-			$result = $this->connection->downloadFile($message->getBlobId());
-			if(null === $result || false === $result->isSuccess()) {
-				throw new Exception('could not download the file with blob id '.$message->getBlobId());
-			}
+			$result = $this->downloadFile($message, $message->getBlobId(), $downloadMessage);
 
-			$file = $this->cryptTool->decryptFile(
-				$result->getData(),
-				hex2bin($message->getEncryptionKey()));
+			if(null !== $result && true === $result->isSuccess()) {
+				$file = $this->cryptTool->decryptFile(
+					$result->getData(),
+					hex2bin($message->getEncryptionKey()));
 
-			if(null === $file) {
-				throw new Exception('file decryption failed');
-			}
+				if (null === $file) {
+					throw new Exception('file decryption failed');
+				}
 
-			//save file
-			$filePath =  $outputFolder.'/'.$messageId.'-'.$message->getFilename();
-			file_put_contents($filePath, $file);
+				//save file
+				$filePath = $outputFolder . '/' . $messageId . '-' . $message->getFilename();
+				file_put_contents($filePath, $file);
 
-			$receiveResult->addFile('file', $filePath);
+				$receiveResult->addFile('file', $filePath);
+			}
 
 			if(null !== $message->getThumbnailBlobId() && strlen($message->getThumbnailBlobId()) > 0) {
-				$result = $this->connection->downloadFile($message->getThumbnailBlobId());
+				$result = $this->downloadFile($message, $message->getThumbnailBlobId(), $downloadMessage);
 				if(null !== $result && true === $result->isSuccess()) {
 					$file = $this->cryptTool->decryptFileThumbnail(
 						$result->getData(),
@@ -285,9 +293,9 @@ class E2EHelper {
 	 * Fetch a public key and check the capability of the threemaId
 	 *
 	 * @param string $threemaId
-	 * @param callable $capabilityCheck
+	 * @param \Closure $capabilityCheck
 	 * @return string Public key as binary
-	 * @throws \Threema\Core\Exception
+	 * @throws Exception
 	 */
 	private final function fetchPublicKeyAndCheckCapability($threemaId, \Closure $capabilityCheck = null) {
 		//fetch the public key
@@ -307,5 +315,26 @@ class E2EHelper {
 
 		return hex2bin($receiverPublicKey->getPublicKey());
 	}
+
+	/**
+	 * @param ThreemaMessage $message
+	 * @param string $blobId blob id as hex
+	 * @param \Closure|null $downloadMessage
+	 * @return null|\Threema\MsgApi\Commands\Results\DownloadFileResult
+	 * @throws Exception
+	 */
+	private final function downloadFile(ThreemaMessage $message, $blobId, \Closure $downloadMessage = null) {
+		if(null === $downloadMessage
+			|| true === $downloadMessage->__invoke($message, $blobId)) {
+			//make a download
+			$result = $this->connection->downloadFile($blobId);
+			if(null === $result || false === $result->isSuccess()) {
+				throw new Exception('could not download the file with blob id '.$blobId);
+			}
+
+			return $result;
+		}
+		return null;
+	}
 }
 
diff --git a/docs/files/bootstrap.html b/docs/files/bootstrap.html
index 0d32a03..0f2ad40 100644
--- a/docs/files/bootstrap.html
+++ b/docs/files/bootstrap.html
@@ -114,7 +114,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-562580655"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1642728948"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-562580655" class="accordion-body collapse in">
+            <div id="namespace-1642728948" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-706753294"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-779650571"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-706753294" class="accordion-body collapse ">
+            <div id="namespace-779650571" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-466908198"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1109919999"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-466908198" class="accordion-body collapse ">
+            <div id="namespace-1109919999" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-91490806"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1756727087"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-91490806" class="accordion-body collapse ">
+            <div id="namespace-1756727087" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -215,10 +215,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-818528113"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-434329097"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-818528113" class="accordion-body collapse ">
+            <div id="namespace-434329097" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -236,28 +236,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-430131059"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-895027122"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-430131059" class="accordion-body collapse ">
+            <div id="namespace-895027122" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-825385250"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-43093444"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-825385250" class="accordion-body collapse ">
+            <div id="namespace-43093444" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1459697108"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-62199"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1459697108" class="accordion-body collapse ">
+            <div id="namespace-62199" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -299,10 +299,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-56407470"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1329380552"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-56407470" class="accordion-body collapse ">
+            <div id="namespace-1329380552" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -320,10 +320,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-438688130"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2068375134"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-438688130" class="accordion-body collapse ">
+            <div id="namespace-2068375134" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -339,10 +339,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1985135743"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1467494313"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1985135743" class="accordion-body collapse ">
+            <div id="namespace-1467494313" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -361,10 +361,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1404097144"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-31743472"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1404097144" class="accordion-body collapse ">
+            <div id="namespace-31743472" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -380,10 +380,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1412649623"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-212066199"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1412649623" class="accordion-body collapse ">
+            <div id="namespace-212066199" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -400,10 +400,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-185736072"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1858800104"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-185736072" class="accordion-body collapse ">
+            <div id="namespace-1858800104" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -578,7 +578,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/graphs/class.html b/docs/graphs/class.html
index e64479f..d19accb 100644
--- a/docs/graphs/class.html
+++ b/docs/graphs/class.html
@@ -91,7 +91,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -161,7 +161,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/index.html b/docs/index.html
index 455fd44..424ab67 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -66,7 +66,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-506907040"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-623524666"></a>
                                 <a href="namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-506907040" class="accordion-body collapse in">
+            <div id="namespace-623524666" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-328280776"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-806937387"></a>
                                 <a href="namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-328280776" class="accordion-body collapse ">
+            <div id="namespace-806937387" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1050121528"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-372590398"></a>
                                 <a href="namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1050121528" class="accordion-body collapse ">
+            <div id="namespace-372590398" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1229330025"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2031757164"></a>
                                 <a href="namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1229330025" class="accordion-body collapse ">
+            <div id="namespace-2031757164" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -167,10 +167,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1359213590"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1732005325"></a>
                                 <a href="namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1359213590" class="accordion-body collapse ">
+            <div id="namespace-1732005325" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -188,28 +188,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-333199584"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-306112992"></a>
                                 <a href="namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-333199584" class="accordion-body collapse ">
+            <div id="namespace-306112992" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-590611148"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2143201486"></a>
                                 <a href="namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-590611148" class="accordion-body collapse ">
+            <div id="namespace-2143201486" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2115195231"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1340143499"></a>
                                 <a href="namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-2115195231" class="accordion-body collapse ">
+            <div id="namespace-1340143499" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -251,10 +251,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1487815362"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-976939721"></a>
                                 <a href="namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1487815362" class="accordion-body collapse ">
+            <div id="namespace-976939721" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -272,10 +272,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1535392806"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-215998684"></a>
                                 <a href="namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1535392806" class="accordion-body collapse ">
+            <div id="namespace-215998684" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -291,10 +291,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1225451612"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-590187537"></a>
                                 <a href="namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1225451612" class="accordion-body collapse ">
+            <div id="namespace-590187537" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -313,10 +313,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1790063508"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-838672462"></a>
                                 <a href="namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1790063508" class="accordion-body collapse ">
+            <div id="namespace-838672462" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -332,10 +332,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2119952853"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-945579080"></a>
                                 <a href="namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2119952853" class="accordion-body collapse ">
+            <div id="namespace-945579080" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -352,10 +352,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1694446877"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1770967253"></a>
                                 <a href="namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1694446877" class="accordion-body collapse ">
+            <div id="namespace-1770967253" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -546,7 +546,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/Threema.Console.Command.html b/docs/namespaces/Threema.Console.Command.html
index f0ba1ef..03f2a90 100644
--- a/docs/namespaces/Threema.Console.Command.html
+++ b/docs/namespaces/Threema.Console.Command.html
@@ -66,7 +66,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1250853179"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-927612050"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1250853179" class="accordion-body collapse in">
+            <div id="namespace-927612050" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1449562253"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-272318638"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1449562253" class="accordion-body collapse ">
+            <div id="namespace-272318638" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-88985311"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1219623757"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-88985311" class="accordion-body collapse ">
+            <div id="namespace-1219623757" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-8758427"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1870320429"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-8758427" class="accordion-body collapse ">
+            <div id="namespace-1870320429" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -167,10 +167,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1240998143"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1814122451"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1240998143" class="accordion-body collapse ">
+            <div id="namespace-1814122451" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -188,28 +188,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2009178359"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1871313232"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-2009178359" class="accordion-body collapse ">
+            <div id="namespace-1871313232" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1252786"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1861648329"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1252786" class="accordion-body collapse ">
+            <div id="namespace-1861648329" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1543984048"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-903115615"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1543984048" class="accordion-body collapse ">
+            <div id="namespace-903115615" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -251,10 +251,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1868821248"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-169312557"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1868821248" class="accordion-body collapse ">
+            <div id="namespace-169312557" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -272,10 +272,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2046097004"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-213616797"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-2046097004" class="accordion-body collapse ">
+            <div id="namespace-213616797" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -291,10 +291,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1784423178"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1064051270"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1784423178" class="accordion-body collapse ">
+            <div id="namespace-1064051270" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -313,10 +313,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-573188268"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-929501215"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-573188268" class="accordion-body collapse ">
+            <div id="namespace-929501215" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -332,10 +332,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-381873192"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1108840161"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-381873192" class="accordion-body collapse ">
+            <div id="namespace-1108840161" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -352,10 +352,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1407788150"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-559123123"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1407788150" class="accordion-body collapse ">
+            <div id="namespace-559123123" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -553,7 +553,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/Threema.Console.html b/docs/namespaces/Threema.Console.html
index 4aac366..95b5f8f 100644
--- a/docs/namespaces/Threema.Console.html
+++ b/docs/namespaces/Threema.Console.html
@@ -66,7 +66,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1194468687"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-446552649"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1194468687" class="accordion-body collapse in">
+            <div id="namespace-446552649" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-12412662"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-49652095"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-12412662" class="accordion-body collapse ">
+            <div id="namespace-49652095" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1092668799"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-979041077"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1092668799" class="accordion-body collapse ">
+            <div id="namespace-979041077" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1320274861"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2123454753"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1320274861" class="accordion-body collapse ">
+            <div id="namespace-2123454753" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -167,10 +167,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-569529091"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1049482608"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-569529091" class="accordion-body collapse ">
+            <div id="namespace-1049482608" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -188,28 +188,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1441329613"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1261315275"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1441329613" class="accordion-body collapse ">
+            <div id="namespace-1261315275" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-41439494"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-661037003"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-41439494" class="accordion-body collapse ">
+            <div id="namespace-661037003" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1096332591"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1096053693"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1096332591" class="accordion-body collapse ">
+            <div id="namespace-1096053693" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -251,10 +251,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1741095372"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1599566948"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1741095372" class="accordion-body collapse ">
+            <div id="namespace-1599566948" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -272,10 +272,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-385149399"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1470340254"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-385149399" class="accordion-body collapse ">
+            <div id="namespace-1470340254" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -291,10 +291,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-19637722"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-379254812"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-19637722" class="accordion-body collapse ">
+            <div id="namespace-379254812" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -313,10 +313,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1622578852"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1446312722"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1622578852" class="accordion-body collapse ">
+            <div id="namespace-1446312722" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -332,10 +332,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-408835941"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-954267019"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-408835941" class="accordion-body collapse ">
+            <div id="namespace-954267019" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -352,10 +352,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1172317763"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1137026498"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1172317763" class="accordion-body collapse ">
+            <div id="namespace-1137026498" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -497,7 +497,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/Threema.Core.html b/docs/namespaces/Threema.Core.html
index b30dea8..5256f56 100644
--- a/docs/namespaces/Threema.Core.html
+++ b/docs/namespaces/Threema.Core.html
@@ -66,7 +66,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-873064399"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-62307207"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-873064399" class="accordion-body collapse in">
+            <div id="namespace-62307207" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-59316331"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-189969055"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-59316331" class="accordion-body collapse ">
+            <div id="namespace-189969055" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2048780535"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1543430667"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-2048780535" class="accordion-body collapse ">
+            <div id="namespace-1543430667" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1349898868"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-731570256"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1349898868" class="accordion-body collapse ">
+            <div id="namespace-731570256" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -167,10 +167,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1171638323"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1449545492"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1171638323" class="accordion-body collapse ">
+            <div id="namespace-1449545492" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -188,28 +188,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1762837737"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1476472669"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1762837737" class="accordion-body collapse ">
+            <div id="namespace-1476472669" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-786465059"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1028992065"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-786465059" class="accordion-body collapse ">
+            <div id="namespace-1028992065" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-907305991"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1866320908"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-907305991" class="accordion-body collapse ">
+            <div id="namespace-1866320908" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -251,10 +251,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-535411233"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-534544196"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-535411233" class="accordion-body collapse ">
+            <div id="namespace-534544196" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -272,10 +272,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-177355136"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-985944326"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-177355136" class="accordion-body collapse ">
+            <div id="namespace-985944326" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -291,10 +291,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-9502056"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1148918672"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-9502056" class="accordion-body collapse ">
+            <div id="namespace-1148918672" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -313,10 +313,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-156199581"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1374038355"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-156199581" class="accordion-body collapse ">
+            <div id="namespace-1374038355" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -332,10 +332,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1843326290"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-701085044"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1843326290" class="accordion-body collapse ">
+            <div id="namespace-701085044" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -352,10 +352,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2137874323"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-826003682"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2137874323" class="accordion-body collapse ">
+            <div id="namespace-826003682" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -499,7 +499,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/Threema.MsgApi.Commands.Results.html b/docs/namespaces/Threema.MsgApi.Commands.Results.html
index 5ed6206..c7b172b 100644
--- a/docs/namespaces/Threema.MsgApi.Commands.Results.html
+++ b/docs/namespaces/Threema.MsgApi.Commands.Results.html
@@ -66,7 +66,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1903469477"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-743872146"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1903469477" class="accordion-body collapse in">
+            <div id="namespace-743872146" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-605756547"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1812716714"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-605756547" class="accordion-body collapse ">
+            <div id="namespace-1812716714" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-894681263"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1996707047"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-894681263" class="accordion-body collapse ">
+            <div id="namespace-1996707047" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1257808533"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-155993149"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1257808533" class="accordion-body collapse ">
+            <div id="namespace-155993149" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -167,10 +167,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-889063486"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-959145903"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-889063486" class="accordion-body collapse ">
+            <div id="namespace-959145903" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -188,28 +188,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-594946486"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-546733072"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-594946486" class="accordion-body collapse ">
+            <div id="namespace-546733072" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-166620121"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1160027015"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-166620121" class="accordion-body collapse ">
+            <div id="namespace-1160027015" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1142892031"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1384268546"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1142892031" class="accordion-body collapse ">
+            <div id="namespace-1384268546" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -251,10 +251,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-223129686"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-169597631"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-223129686" class="accordion-body collapse ">
+            <div id="namespace-169597631" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -272,10 +272,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-454372707"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1606162867"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-454372707" class="accordion-body collapse ">
+            <div id="namespace-1606162867" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -291,10 +291,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1931506081"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1205340830"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1931506081" class="accordion-body collapse ">
+            <div id="namespace-1205340830" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -313,10 +313,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1669076456"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2140936753"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1669076456" class="accordion-body collapse ">
+            <div id="namespace-2140936753" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -332,10 +332,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-92057999"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1406454726"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-92057999" class="accordion-body collapse ">
+            <div id="namespace-1406454726" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -352,10 +352,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-655444761"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-24936667"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-655444761" class="accordion-body collapse ">
+            <div id="namespace-24936667" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -523,7 +523,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/Threema.MsgApi.Commands.html b/docs/namespaces/Threema.MsgApi.Commands.html
index 3109d83..51133c1 100644
--- a/docs/namespaces/Threema.MsgApi.Commands.html
+++ b/docs/namespaces/Threema.MsgApi.Commands.html
@@ -66,7 +66,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1574616012"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-70974108"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1574616012" class="accordion-body collapse in">
+            <div id="namespace-70974108" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-847864977"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-89135285"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-847864977" class="accordion-body collapse ">
+            <div id="namespace-89135285" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1385139628"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1144102249"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1385139628" class="accordion-body collapse ">
+            <div id="namespace-1144102249" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2097260781"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-778767803"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-2097260781" class="accordion-body collapse ">
+            <div id="namespace-778767803" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -167,10 +167,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-968637030"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1050975225"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-968637030" class="accordion-body collapse ">
+            <div id="namespace-1050975225" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -188,28 +188,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1883930975"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-56232755"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1883930975" class="accordion-body collapse ">
+            <div id="namespace-56232755" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-79390876"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1767681918"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-79390876" class="accordion-body collapse ">
+            <div id="namespace-1767681918" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-828459175"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-895058912"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-828459175" class="accordion-body collapse ">
+            <div id="namespace-895058912" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -251,10 +251,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-557169074"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1283823358"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-557169074" class="accordion-body collapse ">
+            <div id="namespace-1283823358" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -272,10 +272,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1959171303"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1398779881"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1959171303" class="accordion-body collapse ">
+            <div id="namespace-1398779881" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -291,10 +291,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2005507454"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1661548365"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-2005507454" class="accordion-body collapse ">
+            <div id="namespace-1661548365" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -313,10 +313,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-742880569"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-209387232"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-742880569" class="accordion-body collapse ">
+            <div id="namespace-209387232" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -332,10 +332,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1028732484"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1765255096"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1028732484" class="accordion-body collapse ">
+            <div id="namespace-1765255096" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -352,10 +352,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1108175113"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2140150934"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1108175113" class="accordion-body collapse ">
+            <div id="namespace-2140150934" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -538,7 +538,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/Threema.MsgApi.Exceptions.html b/docs/namespaces/Threema.MsgApi.Exceptions.html
index 4d40295..82a6136 100644
--- a/docs/namespaces/Threema.MsgApi.Exceptions.html
+++ b/docs/namespaces/Threema.MsgApi.Exceptions.html
@@ -66,7 +66,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-787025478"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-339709200"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-787025478" class="accordion-body collapse in">
+            <div id="namespace-339709200" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-933132178"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-866458045"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-933132178" class="accordion-body collapse ">
+            <div id="namespace-866458045" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1559514882"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-557656429"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1559514882" class="accordion-body collapse ">
+            <div id="namespace-557656429" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-60768083"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-649255197"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-60768083" class="accordion-body collapse ">
+            <div id="namespace-649255197" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -167,10 +167,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2043879672"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1419322985"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-2043879672" class="accordion-body collapse ">
+            <div id="namespace-1419322985" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -188,28 +188,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-526308988"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-852292275"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-526308988" class="accordion-body collapse ">
+            <div id="namespace-852292275" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1087238314"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1176231221"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1087238314" class="accordion-body collapse ">
+            <div id="namespace-1176231221" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-45491624"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-206314771"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-45491624" class="accordion-body collapse ">
+            <div id="namespace-206314771" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -251,10 +251,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1624220611"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1999132768"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1624220611" class="accordion-body collapse ">
+            <div id="namespace-1999132768" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -272,10 +272,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-370953031"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-893834484"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-370953031" class="accordion-body collapse ">
+            <div id="namespace-893834484" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -291,10 +291,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1946482385"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2089375745"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1946482385" class="accordion-body collapse ">
+            <div id="namespace-2089375745" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -313,10 +313,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-297868854"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2090451982"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-297868854" class="accordion-body collapse ">
+            <div id="namespace-2090451982" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -332,10 +332,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1465670497"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-776156610"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1465670497" class="accordion-body collapse ">
+            <div id="namespace-776156610" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -352,10 +352,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1465492095"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1284409111"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1465492095" class="accordion-body collapse ">
+            <div id="namespace-1284409111" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -501,7 +501,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/Threema.MsgApi.Helpers.html b/docs/namespaces/Threema.MsgApi.Helpers.html
index a13f9cb..8848087 100644
--- a/docs/namespaces/Threema.MsgApi.Helpers.html
+++ b/docs/namespaces/Threema.MsgApi.Helpers.html
@@ -66,7 +66,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1983904105"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1803453746"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1983904105" class="accordion-body collapse in">
+            <div id="namespace-1803453746" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1630910645"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-40773320"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1630910645" class="accordion-body collapse ">
+            <div id="namespace-40773320" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-378858059"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1224592193"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-378858059" class="accordion-body collapse ">
+            <div id="namespace-1224592193" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1005850482"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1238826483"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1005850482" class="accordion-body collapse ">
+            <div id="namespace-1238826483" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -167,10 +167,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1154942596"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-947422966"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1154942596" class="accordion-body collapse ">
+            <div id="namespace-947422966" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -188,28 +188,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-394123306"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-225078967"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-394123306" class="accordion-body collapse ">
+            <div id="namespace-225078967" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-182300042"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1924815632"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-182300042" class="accordion-body collapse ">
+            <div id="namespace-1924815632" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-835167306"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1848580331"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-835167306" class="accordion-body collapse ">
+            <div id="namespace-1848580331" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -251,10 +251,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-845015913"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1975964828"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-845015913" class="accordion-body collapse ">
+            <div id="namespace-1975964828" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -272,10 +272,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1604608939"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-331524558"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1604608939" class="accordion-body collapse ">
+            <div id="namespace-331524558" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -291,10 +291,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1124889811"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-39999344"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1124889811" class="accordion-body collapse ">
+            <div id="namespace-39999344" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -313,10 +313,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1384834091"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1430579541"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1384834091" class="accordion-body collapse ">
+            <div id="namespace-1430579541" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -332,10 +332,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-992360276"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1283841335"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-992360276" class="accordion-body collapse ">
+            <div id="namespace-1283841335" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -352,10 +352,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1003348834"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-537942640"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1003348834" class="accordion-body collapse ">
+            <div id="namespace-537942640" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -493,7 +493,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/Threema.MsgApi.Messages.html b/docs/namespaces/Threema.MsgApi.Messages.html
index 397a080..1c476e5 100644
--- a/docs/namespaces/Threema.MsgApi.Messages.html
+++ b/docs/namespaces/Threema.MsgApi.Messages.html
@@ -66,7 +66,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1455846753"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2134347743"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1455846753" class="accordion-body collapse in">
+            <div id="namespace-2134347743" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-48926270"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2124748713"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-48926270" class="accordion-body collapse ">
+            <div id="namespace-2124748713" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1578973177"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1182768680"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1578973177" class="accordion-body collapse ">
+            <div id="namespace-1182768680" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1117154358"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2017146598"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1117154358" class="accordion-body collapse ">
+            <div id="namespace-2017146598" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -167,10 +167,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-364738963"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-893835450"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-364738963" class="accordion-body collapse ">
+            <div id="namespace-893835450" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -188,28 +188,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1373352875"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2138988735"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1373352875" class="accordion-body collapse ">
+            <div id="namespace-2138988735" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-438629219"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1354358537"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-438629219" class="accordion-body collapse ">
+            <div id="namespace-1354358537" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1560940454"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-83311789"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1560940454" class="accordion-body collapse ">
+            <div id="namespace-83311789" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -251,10 +251,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1015794510"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-77531959"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1015794510" class="accordion-body collapse ">
+            <div id="namespace-77531959" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -272,10 +272,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-668418575"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-131714326"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-668418575" class="accordion-body collapse ">
+            <div id="namespace-131714326" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -291,10 +291,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1748156470"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1053615915"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1748156470" class="accordion-body collapse ">
+            <div id="namespace-1053615915" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -313,10 +313,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-800406406"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2137970729"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-800406406" class="accordion-body collapse ">
+            <div id="namespace-2137970729" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -332,10 +332,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1480268450"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-727540080"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1480268450" class="accordion-body collapse ">
+            <div id="namespace-727540080" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -352,10 +352,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-874267093"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1118372017"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-874267093" class="accordion-body collapse ">
+            <div id="namespace-1118372017" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -505,7 +505,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/Threema.MsgApi.PublicKeyStores.html b/docs/namespaces/Threema.MsgApi.PublicKeyStores.html
index 1a704dd..2289384 100644
--- a/docs/namespaces/Threema.MsgApi.PublicKeyStores.html
+++ b/docs/namespaces/Threema.MsgApi.PublicKeyStores.html
@@ -66,7 +66,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-82330345"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1686414444"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-82330345" class="accordion-body collapse in">
+            <div id="namespace-1686414444" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1622060247"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-288171380"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1622060247" class="accordion-body collapse ">
+            <div id="namespace-288171380" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1977938152"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-70101372"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1977938152" class="accordion-body collapse ">
+            <div id="namespace-70101372" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-654108001"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1764086033"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-654108001" class="accordion-body collapse ">
+            <div id="namespace-1764086033" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -167,10 +167,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1962646436"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-884816667"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1962646436" class="accordion-body collapse ">
+            <div id="namespace-884816667" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -188,28 +188,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-265526268"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1954861343"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-265526268" class="accordion-body collapse ">
+            <div id="namespace-1954861343" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-342423264"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-600547299"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-342423264" class="accordion-body collapse ">
+            <div id="namespace-600547299" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-219680306"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-308543044"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-219680306" class="accordion-body collapse ">
+            <div id="namespace-308543044" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -251,10 +251,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-18887146"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1170748313"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-18887146" class="accordion-body collapse ">
+            <div id="namespace-1170748313" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -272,10 +272,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-791209453"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2013267801"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-791209453" class="accordion-body collapse ">
+            <div id="namespace-2013267801" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -291,10 +291,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1518282352"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1251053311"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-1518282352" class="accordion-body collapse ">
+            <div id="namespace-1251053311" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -313,10 +313,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-6601791"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-685534215"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-6601791" class="accordion-body collapse ">
+            <div id="namespace-685534215" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -332,10 +332,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1571747764"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-570316818"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1571747764" class="accordion-body collapse ">
+            <div id="namespace-570316818" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -352,10 +352,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2144698163"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-727305771"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2144698163" class="accordion-body collapse ">
+            <div id="namespace-727305771" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -493,7 +493,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/Threema.MsgApi.Tests.html b/docs/namespaces/Threema.MsgApi.Tests.html
index 15ad166..e0a7d38 100644
--- a/docs/namespaces/Threema.MsgApi.Tests.html
+++ b/docs/namespaces/Threema.MsgApi.Tests.html
@@ -66,7 +66,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-246569071"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1461183912"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-246569071" class="accordion-body collapse in">
+            <div id="namespace-1461183912" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-528464684"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-198203956"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-528464684" class="accordion-body collapse ">
+            <div id="namespace-198203956" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1273304341"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1231891259"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1273304341" class="accordion-body collapse ">
+            <div id="namespace-1231891259" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1696298157"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-475165562"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1696298157" class="accordion-body collapse ">
+            <div id="namespace-475165562" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -167,10 +167,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-708493759"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1693976424"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-708493759" class="accordion-body collapse ">
+            <div id="namespace-1693976424" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -188,28 +188,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1776761252"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-140963551"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1776761252" class="accordion-body collapse ">
+            <div id="namespace-140963551" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2071430903"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-73793599"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-2071430903" class="accordion-body collapse ">
+            <div id="namespace-73793599" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1044176075"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-476995009"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1044176075" class="accordion-body collapse ">
+            <div id="namespace-476995009" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -251,10 +251,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1739737810"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1557711374"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1739737810" class="accordion-body collapse ">
+            <div id="namespace-1557711374" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -272,10 +272,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-923775290"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1686606667"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-923775290" class="accordion-body collapse ">
+            <div id="namespace-1686606667" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -291,10 +291,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-576870436"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-12048517"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-576870436" class="accordion-body collapse ">
+            <div id="namespace-12048517" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -313,10 +313,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1464412745"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-997001828"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1464412745" class="accordion-body collapse ">
+            <div id="namespace-997001828" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -332,10 +332,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-604002866"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1607867335"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-604002866" class="accordion-body collapse ">
+            <div id="namespace-1607867335" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -352,10 +352,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-931746807"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1204306940"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-931746807" class="accordion-body collapse ">
+            <div id="namespace-1204306940" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -497,7 +497,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/Threema.MsgApi.Tools.html b/docs/namespaces/Threema.MsgApi.Tools.html
index 979b856..ef6e2ef 100644
--- a/docs/namespaces/Threema.MsgApi.Tools.html
+++ b/docs/namespaces/Threema.MsgApi.Tools.html
@@ -66,7 +66,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-665261661"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2112401045"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-665261661" class="accordion-body collapse in">
+            <div id="namespace-2112401045" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-853515794"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-14029370"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-853515794" class="accordion-body collapse ">
+            <div id="namespace-14029370" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-683585444"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1430759530"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-683585444" class="accordion-body collapse ">
+            <div id="namespace-1430759530" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-879227835"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-962371839"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-879227835" class="accordion-body collapse ">
+            <div id="namespace-962371839" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -167,10 +167,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1768694441"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2029028331"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1768694441" class="accordion-body collapse ">
+            <div id="namespace-2029028331" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -188,28 +188,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1546937333"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2036282804"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1546937333" class="accordion-body collapse ">
+            <div id="namespace-2036282804" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2087566906"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-235458353"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-2087566906" class="accordion-body collapse ">
+            <div id="namespace-235458353" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1296805845"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1688378694"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1296805845" class="accordion-body collapse ">
+            <div id="namespace-1688378694" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -251,10 +251,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-825573274"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1600070942"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-825573274" class="accordion-body collapse ">
+            <div id="namespace-1600070942" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -272,10 +272,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-628205507"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1363002053"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-628205507" class="accordion-body collapse ">
+            <div id="namespace-1363002053" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -291,10 +291,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-175123650"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-876282058"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-175123650" class="accordion-body collapse ">
+            <div id="namespace-876282058" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -313,10 +313,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-979791919"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2041396854"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-979791919" class="accordion-body collapse ">
+            <div id="namespace-2041396854" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -332,10 +332,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2014669415"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1750527177"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2014669415" class="accordion-body collapse ">
+            <div id="namespace-1750527177" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -352,10 +352,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1181158088"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2060036535"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1181158088" class="accordion-body collapse ">
+            <div id="namespace-2060036535" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -514,7 +514,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/Threema.MsgApi.html b/docs/namespaces/Threema.MsgApi.html
index 43d4604..cb29f83 100644
--- a/docs/namespaces/Threema.MsgApi.html
+++ b/docs/namespaces/Threema.MsgApi.html
@@ -66,7 +66,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1231938179"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1934545837"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1231938179" class="accordion-body collapse in">
+            <div id="namespace-1934545837" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-239551815"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-575284231"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-239551815" class="accordion-body collapse ">
+            <div id="namespace-575284231" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1867981632"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-542074725"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1867981632" class="accordion-body collapse ">
+            <div id="namespace-542074725" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1670634733"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1765312987"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1670634733" class="accordion-body collapse ">
+            <div id="namespace-1765312987" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -167,10 +167,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1300751257"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-478739380"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1300751257" class="accordion-body collapse ">
+            <div id="namespace-478739380" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -188,28 +188,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1667196971"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1785994046"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1667196971" class="accordion-body collapse ">
+            <div id="namespace-1785994046" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1149462402"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1853408058"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1149462402" class="accordion-body collapse ">
+            <div id="namespace-1853408058" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1289106007"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-362870351"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1289106007" class="accordion-body collapse ">
+            <div id="namespace-362870351" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -251,10 +251,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-712621430"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-86600098"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-712621430" class="accordion-body collapse ">
+            <div id="namespace-86600098" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -272,10 +272,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-832808149"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-481679335"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-832808149" class="accordion-body collapse ">
+            <div id="namespace-481679335" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -291,10 +291,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-121058001"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2031922143"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-121058001" class="accordion-body collapse ">
+            <div id="namespace-2031922143" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -313,10 +313,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-227877625"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-389343408"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-227877625" class="accordion-body collapse ">
+            <div id="namespace-389343408" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -332,10 +332,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-307965572"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1554110019"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-307965572" class="accordion-body collapse ">
+            <div id="namespace-1554110019" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -352,10 +352,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2027057419"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1651053786"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-2027057419" class="accordion-body collapse ">
+            <div id="namespace-1651053786" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -528,7 +528,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/Threema.html b/docs/namespaces/Threema.html
index d6fcb33..4601f89 100644
--- a/docs/namespaces/Threema.html
+++ b/docs/namespaces/Threema.html
@@ -66,7 +66,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1200561559"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-587918917"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1200561559" class="accordion-body collapse in">
+            <div id="namespace-587918917" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1159605011"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1547851468"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-1159605011" class="accordion-body collapse ">
+            <div id="namespace-1547851468" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1767244607"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1702362920"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-1767244607" class="accordion-body collapse ">
+            <div id="namespace-1702362920" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1182535017"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-323302745"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-1182535017" class="accordion-body collapse ">
+            <div id="namespace-323302745" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -167,10 +167,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1245712392"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1720762065"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1245712392" class="accordion-body collapse ">
+            <div id="namespace-1720762065" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -188,28 +188,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1793936086"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-236536657"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-1793936086" class="accordion-body collapse ">
+            <div id="namespace-236536657" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1795068890"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1372351281"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1795068890" class="accordion-body collapse ">
+            <div id="namespace-1372351281" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-465538615"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1231530716"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-465538615" class="accordion-body collapse ">
+            <div id="namespace-1231530716" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -251,10 +251,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-4357272"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1934848059"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-4357272" class="accordion-body collapse ">
+            <div id="namespace-1934848059" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -272,10 +272,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1991542676"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1418250296"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1991542676" class="accordion-body collapse ">
+            <div id="namespace-1418250296" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -291,10 +291,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-452076173"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-850115840"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-452076173" class="accordion-body collapse ">
+            <div id="namespace-850115840" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -313,10 +313,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-185446029"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-806891876"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-185446029" class="accordion-body collapse ">
+            <div id="namespace-806891876" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -332,10 +332,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2014517851"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1328266332"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-2014517851" class="accordion-body collapse ">
+            <div id="namespace-1328266332" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -352,10 +352,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1946328091"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1031284710"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-1946328091" class="accordion-body collapse ">
+            <div id="namespace-1031284710" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -490,7 +490,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/default.html b/docs/namespaces/default.html
index fab07a0..4eb3246 100644
--- a/docs/namespaces/default.html
+++ b/docs/namespaces/default.html
@@ -66,7 +66,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1346790313"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-356939958"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1346790313" class="accordion-body collapse in">
+            <div id="namespace-356939958" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2014356559"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1157962097"></a>
                                 <a href="../namespaces/Threema.html" style="margin-left: 30px; padding-left: 0">Threema</a>
             </div>
-            <div id="namespace-2014356559" class="accordion-body collapse ">
+            <div id="namespace-1157962097" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-90620603"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-198533305"></a>
                                 <a href="../namespaces/Threema.Console.html" style="margin-left: 30px; padding-left: 0">Console</a>
             </div>
-            <div id="namespace-90620603" class="accordion-body collapse ">
+            <div id="namespace-198533305" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-506967364"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1336666894"></a>
                                 <a href="../namespaces/Threema.Console.Command.html" style="margin-left: 30px; padding-left: 0">Command</a>
             </div>
-            <div id="namespace-506967364" class="accordion-body collapse ">
+            <div id="namespace-1336666894" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -167,10 +167,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1794755980"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-761116269"></a>
                                 <a href="../namespaces/Threema.Core.html" style="margin-left: 30px; padding-left: 0">Core</a>
             </div>
-            <div id="namespace-1794755980" class="accordion-body collapse ">
+            <div id="namespace-761116269" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -188,28 +188,28 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-178199776"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1706832737"></a>
                                 <a href="../namespaces/Threema.MsgApi.html" style="margin-left: 30px; padding-left: 0">MsgApi</a>
             </div>
-            <div id="namespace-178199776" class="accordion-body collapse ">
+            <div id="namespace-1706832737" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1156200197"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-35428754"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.html" style="margin-left: 30px; padding-left: 0">Commands</a>
             </div>
-            <div id="namespace-1156200197" class="accordion-body collapse ">
+            <div id="namespace-35428754" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1324800076"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-321994428"></a>
                                 <a href="../namespaces/Threema.MsgApi.Commands.Results.html" style="margin-left: 30px; padding-left: 0">Results</a>
             </div>
-            <div id="namespace-1324800076" class="accordion-body collapse ">
+            <div id="namespace-321994428" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -251,10 +251,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1196708329"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1091363638"></a>
                                 <a href="../namespaces/Threema.MsgApi.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1196708329" class="accordion-body collapse ">
+            <div id="namespace-1091363638" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -272,10 +272,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1547996156"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-596142714"></a>
                                 <a href="../namespaces/Threema.MsgApi.Helpers.html" style="margin-left: 30px; padding-left: 0">Helpers</a>
             </div>
-            <div id="namespace-1547996156" class="accordion-body collapse ">
+            <div id="namespace-596142714" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -291,10 +291,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-737501135"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1448717697"></a>
                                 <a href="../namespaces/Threema.MsgApi.Messages.html" style="margin-left: 30px; padding-left: 0">Messages</a>
             </div>
-            <div id="namespace-737501135" class="accordion-body collapse ">
+            <div id="namespace-1448717697" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -313,10 +313,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1111079308"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1386540776"></a>
                                 <a href="../namespaces/Threema.MsgApi.PublicKeyStores.html" style="margin-left: 30px; padding-left: 0">PublicKeyStores</a>
             </div>
-            <div id="namespace-1111079308" class="accordion-body collapse ">
+            <div id="namespace-1386540776" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -332,10 +332,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1066172658"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2097795157"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tests.html" style="margin-left: 30px; padding-left: 0">Tests</a>
             </div>
-            <div id="namespace-1066172658" class="accordion-body collapse ">
+            <div id="namespace-2097795157" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -352,10 +352,10 @@
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-97220496"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-692445459"></a>
                                 <a href="../namespaces/Threema.MsgApi.Tools.html" style="margin-left: 30px; padding-left: 0">Tools</a>
             </div>
-            <div id="namespace-97220496" class="accordion-body collapse ">
+            <div id="namespace-692445459" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -546,7 +546,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/reports/deprecated.html b/docs/reports/deprecated.html
index 69325bb..075bf39 100644
--- a/docs/reports/deprecated.html
+++ b/docs/reports/deprecated.html
@@ -67,7 +67,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -169,7 +169,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/reports/errors.html b/docs/reports/errors.html
index 9213bbd..47f325f 100644
--- a/docs/reports/errors.html
+++ b/docs/reports/errors.html
@@ -67,7 +67,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -955,7 +955,7 @@ <h3>
                         <h3>
                             <i class="icon-file"></i>
                             Threema/MsgApi/Helpers/E2EHelper.php
-                            <small style="float: right;padding-right: 10px;">5</small>
+                            <small style="float: right;padding-right: 10px;">6</small>
                         </h3>
                         <div>
                             <table class="table markers table-bordered">
@@ -974,22 +974,27 @@ <h3>
                                     </tr>
                                                                     <tr>
                                         <td>error</td>
-                                        <td>18</td>
+                                        <td>19</td>
                                         <td>No summary for class \Threema\MsgApi\Helpers\E2EHelper</td>
                                     </tr>
                                                                     <tr>
                                         <td>error</td>
-                                        <td>39</td>
+                                        <td>40</td>
                                         <td>No summary for method __construct()</td>
                                     </tr>
                                                                     <tr>
                                         <td>error</td>
-                                        <td>22</td>
+                                        <td>326</td>
+                                        <td>No summary for method downloadFile()</td>
+                                    </tr>
+                                                                    <tr>
+                                        <td>error</td>
+                                        <td>23</td>
                                         <td>No summary for property $connection</td>
                                     </tr>
                                                                     <tr>
                                         <td>error</td>
-                                        <td>27</td>
+                                        <td>28</td>
                                         <td>No summary for property $cryptTool</td>
                                     </tr>
                                                             </tbody>
@@ -5410,7 +5415,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/docs/reports/markers.html b/docs/reports/markers.html
index 863c1ef..3453044 100644
--- a/docs/reports/markers.html
+++ b/docs/reports/markers.html
@@ -67,7 +67,7 @@
                         <ul class="dropdown-menu">
                             <li>
                                 <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">705</span>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">706</span>
                                 </a>
                             </li>
                             <li>
@@ -150,7 +150,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on September 24th, 2015 at 11:02.
+                    on November 9th, 2015 at 10:10.
                 </section>
             </section>
         </section>
diff --git a/source/Threema/MsgApi/Helpers/E2EHelper.php b/source/Threema/MsgApi/Helpers/E2EHelper.php
index 4a22683..d0a9297 100644
--- a/source/Threema/MsgApi/Helpers/E2EHelper.php
+++ b/source/Threema/MsgApi/Helpers/E2EHelper.php
@@ -11,6 +11,7 @@
 use Threema\MsgApi\Connection;
 use Threema\MsgApi\Messages\FileMessage;
 use Threema\MsgApi\Messages\ImageMessage;
+use Threema\MsgApi\Messages\ThreemaMessage;
 use Threema\MsgApi\Tools\CryptTool;
 use Threema\Core\Exception;
 use Threema\MsgApi\Tools\FileAnalysisTool;
@@ -178,6 +179,7 @@ public final function sendFileMessage($threemaId, $filePath, $thumbnailPath = nu
 		return $this->connection->sendE2E($threemaId, $nonce, $fileMessage);
 	}
 
+
 	/**
 	 * Encrypt a message and download the files of the message to the $outputFolder
 	 *
@@ -186,10 +188,19 @@ public final function sendFileMessage($threemaId, $filePath, $thumbnailPath = nu
 	 * @param string $box box as binary string
 	 * @param string $nonce nonce as binary string
 	 * @param string|null $outputFolder folder for storing the files
-	 * @throws \Threema\Core\Exception
+	 * @param \Closure $downloadMessage
 	 * @return ReceiveMessageResult
+	 * @throws Exception
+	 * @throws \Threema\MsgApi\Exceptions\BadMessageException
+	 * @throws \Threema\MsgApi\Exceptions\DecryptionFailedException
+	 * @throws \Threema\MsgApi\Exceptions\UnsupportedMessageTypeException
 	 */
-	public final function receiveMessage($threemaId, $messageId, $box, $nonce, $outputFolder = null) {
+	public final function receiveMessage($threemaId,
+										 $messageId,
+										 $box,
+										 $nonce,
+										 $outputFolder = null,
+										 \Closure $downloadMessage = null) {
 
 		if($outputFolder == null || strlen($outputFolder) == 0) {
 			$outputFolder = '.';
@@ -216,51 +227,48 @@ public final function receiveMessage($threemaId, $messageId, $box, $nonce, $outp
 		$receiveResult = new ReceiveMessageResult($messageId, $message);
 
 		if($message instanceof ImageMessage) {
-			$result = $this->connection->downloadFile($message->getBlobId());
-			if(null === $result || false === $result->isSuccess()) {
-				throw new Exception('could not download the image with blob id '.$message->getBlobId());
-			}
-
-			$image = $this->cryptTool->decryptImage(
-				$result->getData(),
-				hex2bin($receiverPublicKey->getPublicKey()),
-				$this->privateKey,
-				$message->getNonce()
-			);
+			$result = $this->downloadFile($message, $message->getBlobId(), $downloadMessage);
+			if(null !== $result && true === $result->isSuccess()) {
+				$image = $this->cryptTool->decryptImage(
+					$result->getData(),
+					hex2bin($receiverPublicKey->getPublicKey()),
+					$this->privateKey,
+					$message->getNonce()
+				);
+
+				if (null === $image) {
+					throw new Exception('decryption of image failed');
+				}
+				//save file
+				$filePath = $outputFolder . '/' . $messageId . '.jpg';
+				$f = fopen($filePath, 'w+');
+				fwrite($f, $image);
+				fclose($f);
 
-			if(null === $image) {
-				throw new Exception('decryption of image failed');
+				$receiveResult->addFile('image', $filePath);
 			}
-			//save file
-			$filePath = $outputFolder.'/'.$messageId.'.jpg';
-			$f = fopen($filePath, 'w+');
-			fwrite($f, $image);
-			fclose($f);
-
-			$receiveResult->addFile('image', $filePath);
 		}
 		else if($message instanceof FileMessage) {
-			$result = $this->connection->downloadFile($message->getBlobId());
-			if(null === $result || false === $result->isSuccess()) {
-				throw new Exception('could not download the file with blob id '.$message->getBlobId());
-			}
+			$result = $this->downloadFile($message, $message->getBlobId(), $downloadMessage);
 
-			$file = $this->cryptTool->decryptFile(
-				$result->getData(),
-				hex2bin($message->getEncryptionKey()));
+			if(null !== $result && true === $result->isSuccess()) {
+				$file = $this->cryptTool->decryptFile(
+					$result->getData(),
+					hex2bin($message->getEncryptionKey()));
 
-			if(null === $file) {
-				throw new Exception('file decryption failed');
-			}
+				if (null === $file) {
+					throw new Exception('file decryption failed');
+				}
 
-			//save file
-			$filePath =  $outputFolder.'/'.$messageId.'-'.$message->getFilename();
-			file_put_contents($filePath, $file);
+				//save file
+				$filePath = $outputFolder . '/' . $messageId . '-' . $message->getFilename();
+				file_put_contents($filePath, $file);
 
-			$receiveResult->addFile('file', $filePath);
+				$receiveResult->addFile('file', $filePath);
+			}
 
 			if(null !== $message->getThumbnailBlobId() && strlen($message->getThumbnailBlobId()) > 0) {
-				$result = $this->connection->downloadFile($message->getThumbnailBlobId());
+				$result = $this->downloadFile($message, $message->getThumbnailBlobId(), $downloadMessage);
 				if(null !== $result && true === $result->isSuccess()) {
 					$file = $this->cryptTool->decryptFileThumbnail(
 						$result->getData(),
@@ -285,9 +293,9 @@ public final function receiveMessage($threemaId, $messageId, $box, $nonce, $outp
 	 * Fetch a public key and check the capability of the threemaId
 	 *
 	 * @param string $threemaId
-	 * @param callable $capabilityCheck
+	 * @param \Closure $capabilityCheck
 	 * @return string Public key as binary
-	 * @throws \Threema\Core\Exception
+	 * @throws Exception
 	 */
 	private final function fetchPublicKeyAndCheckCapability($threemaId, \Closure $capabilityCheck = null) {
 		//fetch the public key
@@ -307,4 +315,25 @@ private final function fetchPublicKeyAndCheckCapability($threemaId, \Closure $ca
 
 		return hex2bin($receiverPublicKey->getPublicKey());
 	}
+
+	/**
+	 * @param ThreemaMessage $message
+	 * @param string $blobId blob id as hex
+	 * @param \Closure|null $downloadMessage
+	 * @return null|\Threema\MsgApi\Commands\Results\DownloadFileResult
+	 * @throws Exception
+	 */
+	private final function downloadFile(ThreemaMessage $message, $blobId, \Closure $downloadMessage = null) {
+		if(null === $downloadMessage
+			|| true === $downloadMessage->__invoke($message, $blobId)) {
+			//make a download
+			$result = $this->connection->downloadFile($blobId);
+			if(null === $result || false === $result->isSuccess()) {
+				throw new Exception('could not download the file with blob id '.$blobId);
+			}
+
+			return $result;
+		}
+		return null;
+	}
 }
diff --git a/source/bootstrap.php b/source/bootstrap.php
index 3e738f9..f10b866 100644
--- a/source/bootstrap.php
+++ b/source/bootstrap.php
@@ -19,7 +19,7 @@
 	}
 });
 
-$sdkVersion = '1.1.2';
+$sdkVersion = '1.1.3';
 define('MSGAPI_SDK_VERSION', $sdkVersion);
 $cryptTool = Threema\MsgApi\Tools\CryptTool::getInstance();
 
diff --git a/threema_msgapi.phar b/threema_msgapi.phar
index 578cc13..fa1da42 100644
Binary files a/threema_msgapi.phar and b/threema_msgapi.phar differ