diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/sharing/SharingActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/sharing/SharingActivity.java
index 394a1f3..e74f58e 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/sharing/SharingActivity.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/sharing/SharingActivity.java
@@ -13,6 +13,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import java.util.ArrayList;
@@ -22,6 +23,7 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 import de.beyondsoft.ownchat.R;
 import de.beyondsoft.ownchat.data.AppPrefsConstants;
 import de.beyondsoft.ownchat.data.prefs.BooleanPreference;
@@ -50,10 +52,6 @@ public class SharingActivity extends RuntimePermissionActivity implements Sharin
     @Named(AppPrefsConstants.LOGIN_TOKEN)
     StringPreference mLoginTokenPreference;
 
-    @Inject
-    @Named(AppPrefsConstants.USER_ID)
-    LongPreference mUserIdPreference;
-
     @BindView(R.id.sharing_contacts_recycler_view)
     RecyclerView mContactsRecyclerView;
 
@@ -101,6 +99,8 @@ public class SharingActivity extends RuntimePermissionActivity implements Sharin
     }
 
     private void returnToContactList(int requestCode) {
+        mSelectedFilePath.delete();
+        mIsComingFromSharingActivity.set(false);
         startActivity(new Intent(this, MainActivity.class));
         finishAffinity();
     }
@@ -195,4 +195,9 @@ public class SharingActivity extends RuntimePermissionActivity implements Sharin
     public void setGroups(ArrayList<Group> groups) {
         mContactsAdapter.setGroups(groups);
     }
+
+    @OnClick(R.id.chat_toolbar_back_arrow)
+    public void onBackArrowClick(View view) {
+        returnToContactList(0);
+    }
 }