diff --git a/Android/BewoMitarbeiterApp/.idea/gradle.xml b/Android/BewoMitarbeiterApp/.idea/gradle.xml
index e5e9072bd..fe72da507 100644
--- a/Android/BewoMitarbeiterApp/.idea/gradle.xml
+++ b/Android/BewoMitarbeiterApp/.idea/gradle.xml
@@ -10,7 +10,6 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/volley" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/Android/BewoMitarbeiterApp/.idea/modules.xml b/Android/BewoMitarbeiterApp/.idea/modules.xml
index da41f4eb4..970cc5202 100644
--- a/Android/BewoMitarbeiterApp/.idea/modules.xml
+++ b/Android/BewoMitarbeiterApp/.idea/modules.xml
@@ -4,7 +4,6 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/BewoMitarbeiterApp.iml" filepath="$PROJECT_DIR$/BewoMitarbeiterApp.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/volley/volley.iml" filepath="$PROJECT_DIR$/volley/volley.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/Android/BewoMitarbeiterApp/.idea/vcs.xml b/Android/BewoMitarbeiterApp/.idea/vcs.xml
index 1300e34f6..b2bdec2d7 100644
--- a/Android/BewoMitarbeiterApp/.idea/vcs.xml
+++ b/Android/BewoMitarbeiterApp/.idea/vcs.xml
@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/volley" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Android/BewoMitarbeiterApp/app/app.iml b/Android/BewoMitarbeiterApp/app/app.iml
index 2b71d64e0..15f50eb78 100644
--- a/Android/BewoMitarbeiterApp/app/app.iml
+++ b/Android/BewoMitarbeiterApp/app/app.iml
@@ -98,7 +98,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
@@ -114,35 +113,13 @@
     <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="ksoap2-android-assembly-3.6.0-jar-with-dependencies" level="project" />
     <orderEntry type="library" exported="" name="gson-2.6.2" level="project" />
+    <orderEntry type="library" exported="" name="volley" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="commons-lang3-3.3.2" level="project" />
     <orderEntry type="library" exported="" name="robospice-1.4.14" level="project" />
     <orderEntry type="library" exported="" name="robospice-cache-1.4.14" level="project" />
     <orderEntry type="library" exported="" name="commons-io-1.3.2" level="project" />
-    <orderEntry type="module" module-name="volley" exported="" />
     <orderEntry type="library" exported="" name="android-android-21" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="junit-4.10" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Android/BewoMitarbeiterApp/app/build.gradle b/Android/BewoMitarbeiterApp/app/build.gradle
index 88eab8b7c..3f2bc31d5 100644
--- a/Android/BewoMitarbeiterApp/app/build.gradle
+++ b/Android/BewoMitarbeiterApp/app/build.gradle
@@ -22,7 +22,7 @@ android {
 dependencies {
     compile 'com.android.support:appcompat-v7:21.0.3'
     compile 'com.octo.android.robospice:robospice:1.4.14'
-    compile project(':volley')
     compile files('src/libs/gson-2.6.2.jar')
     compile files('src/libs/ksoap2-android-assembly-3.6.0-jar-with-dependencies.jar')
+    compile files('src/libs/volley.jar')
 }
diff --git a/Android/BewoMitarbeiterApp/app/src/libs/volley.jar b/Android/BewoMitarbeiterApp/app/src/libs/volley.jar
new file mode 100644
index 000000000..d9279b4ab
Binary files /dev/null and b/Android/BewoMitarbeiterApp/app/src/libs/volley.jar differ
diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/ChatActivity.java b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/ChatActivity.java
index d76af264c..5a2109b55 100644
--- a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/ChatActivity.java
+++ b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/ChatActivity.java
@@ -43,7 +43,6 @@ import org.ksoap2.serialization.SoapPrimitive;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
@@ -429,6 +428,12 @@ public class ChatActivity extends ActionBarActivity implements ConnectivityRecei
 
         @Override
         public void onRequestSuccess(SoapPrimitive soapPrimitive) {
+
+            if(soapPrimitive == null) {
+                Log.e(LOGTAG, "Der vom Server zurückgelieferte Wert ist NULL! (Laden sämtlicher Nachrichten)");
+                return;
+            }
+
             GsonBuilder builder = new GsonBuilder();
             builder.registerTypeAdapter(ChatMessage.class, new ChatMessageDeserializer());
 
diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java
index 9bdb95d02..739c60107 100644
--- a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java
+++ b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java
@@ -26,7 +26,6 @@ import org.ksoap2.serialization.PropertyInfo;
 import org.ksoap2.serialization.SoapPrimitive;
 
 import java.io.ByteArrayOutputStream;
-import java.lang.reflect.Array;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -161,7 +160,6 @@ public class KontaktChatActivity extends ActionBarActivity implements Connectivi
             try {
                 switch(chatPacket.ChatDataIdentifier) {
                     case MESSAGE:
-                        //TODO: Statt Notification Nachricht fett in der Liste darstellen? Oder beides?
                         Util.SetNotify(chatPacket.ChatName, chatPacket.ChatMessage, chatPacket.SenderPersonOid, false, null, null, getApplicationContext());
 
                         runOnUiThread(new Runnable() {
@@ -375,7 +373,8 @@ public class KontaktChatActivity extends ActionBarActivity implements Connectivi
         @Override
         public void onRequestSuccess(SoapPrimitive soapPrimitive) {
             if(soapPrimitive == null) {
-                Log.e("KONTAKT_CHAT_ACTIVITY", "Neueste Nachrichten ist NULL!");
+                Log.e("KONTAKT_CHAT_ACTIVITY", "Der vom Server zurückgelieferte Wert ist NULL! (Laden der neuesten Nachrichten)");
+                return;
             }
 
             GsonBuilder builder = new GsonBuilder();
@@ -420,7 +419,8 @@ public class KontaktChatActivity extends ActionBarActivity implements Connectivi
         @Override
         public void onRequestSuccess(SoapPrimitive soapPrimitive) {
             if(soapPrimitive == null) {
-                Log.e("KONTAKT_CHAT_ACTIVITY", "soapPrimitive ist NULL!");
+                Log.e("KONTAKT_CHAT_ACTIVITY", "Der vom Server zurückgelieferte Wert ist NULL! (Laden der Kontakte)");
+                return;
             }
 
             Gson gson = new GsonBuilder().create();
diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java
index 673ce22ac..bdbfd69b7 100644
--- a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java
+++ b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java
@@ -198,10 +198,7 @@ public class LoginActivity extends ActionBarActivity {
 //
 //                        clearSharedPreferences();
 //
-//                        mPasswordView.setError(getString(R.string.error_invalid_input));
-//                        mUsernameView.setError(getString(R.string.error_invalid_input));
 //                        mChatCodeView.setError(getString(R.string.error_invalid_input));
-//                        mTenantView.setError(getString(R.string.error_invalid_input));
 //
 //                        return;
 //                    }
diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/SoapCalls.java b/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/SoapCalls.java
index 8770df27f..38d8e35e3 100644
--- a/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/SoapCalls.java
+++ b/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/SoapCalls.java
@@ -12,24 +12,24 @@ public class SoapCalls {
     public static String KEEP_ALIVE = "KeepAlive";
 
     //TODO: "app4.bewoplaner.de";//
-    public static String DESTINATION_ADDRESS = "app4.bewoplaner.de";
-    public static int DESTINATION_PORT = 5000;
-
-    public static String TOKEN_CHECK_URL = "https://" + DESTINATION_ADDRESS + "/mobil/main/checktoken?token=";
-
-    public static String WEB_DOKU_URL = "https://" + DESTINATION_ADDRESS + "/mobil/login/demo";
-
-    public static String WSDL_TARGET_NAME = "bliblablubb.org/";
-    public static String SOAP_ADDRESS = "https://" + DESTINATION_ADDRESS + "/BeWoPlanerAndroid/AndroidSoapService.asmx";
-
-
-//    public static String DESTINATION_ADDRESS = "192.168.1.103";
+//    public static String DESTINATION_ADDRESS = "app4.bewoplaner.de";
 //    public static int DESTINATION_PORT = 5000;
 //
-//    public static String TOKEN_CHECK_URL = "http://" + DESTINATION_ADDRESS + "/bewoplanermobil/main/checktoken?token=";
+//    public static String TOKEN_CHECK_URL = "https://" + DESTINATION_ADDRESS + "/mobil/main/checktoken?token=";
 //
-//    public static String WEB_DOKU_URL = "http://" + DESTINATION_ADDRESS + "/bewoplanermobil/login/demo";
+//    public static String WEB_DOKU_URL = "https://" + DESTINATION_ADDRESS + "/mobil/login/demo";
 //
-//    static String WSDL_TARGET_NAME = "bliblablubb.org/";
-//    static String SOAP_ADDRESS = "http://" + DESTINATION_ADDRESS + "/BeWoPlanerAndroid/AndroidSoapService.asmx";
+//    public static String WSDL_TARGET_NAME = "bliblablubb.org/";
+//    public static String SOAP_ADDRESS = "https://" + DESTINATION_ADDRESS + "/BeWoPlanerAndroid/AndroidSoapService.asmx";
+
+
+    public static String DESTINATION_ADDRESS = "192.168.1.103";
+    public static int DESTINATION_PORT = 5000;
+
+    public static String TOKEN_CHECK_URL = "http://" + DESTINATION_ADDRESS + "/bewoplanermobil/main/checktoken?token=";
+
+    public static String WEB_DOKU_URL = "http://" + DESTINATION_ADDRESS + "/bewoplanermobil/login/demo";
+
+    static String WSDL_TARGET_NAME = "bliblablubb.org/";
+    static String SOAP_ADDRESS = "http://" + DESTINATION_ADDRESS + "/BeWoPlanerAndroid/AndroidSoapService.asmx";
 }
diff --git a/Android/BewoMitarbeiterApp/settings.gradle b/Android/BewoMitarbeiterApp/settings.gradle
index 0f93db5ca..3d1d8e628 100644
--- a/Android/BewoMitarbeiterApp/settings.gradle
+++ b/Android/BewoMitarbeiterApp/settings.gradle
@@ -1,2 +1,2 @@
-include ':app', ':volley'
+include ':app'
 
diff --git a/Android/BewoMitarbeiterApp/volley b/Android/BewoMitarbeiterApp/volley
deleted file mode 160000
index c7de21ae2..000000000
--- a/Android/BewoMitarbeiterApp/volley
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c7de21ae29f5ff1ac2d25c27f3e2fb332630938c
diff --git a/BeWoChatServer/Server.cs b/BeWoChatServer/Server.cs
index 5797efaf2..9128d2334 100644
--- a/BeWoChatServer/Server.cs
+++ b/BeWoChatServer/Server.cs
@@ -262,7 +262,7 @@ namespace BeWoChatServer
                                     EmpfaengerPersonOid = dataPacket.RecipientPersonOid,
                                     Uhrzeit            = DateTime.Now,
                                     InsUser            = dataPacket.ClientName,
-                                    IsDelivered        = dataPacket.IsDelivered
+                                    IsDelivered        = true//dataPacket.IsDelivered
                                 };
 
                                 Console.WriteLine(DateTime.Now + ": Speichere die Chat-Nachricht in die Datenbank");