diff --git a/.idea/misc.xml b/.idea/misc.xml
index f8cc316..45c2291 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -40,7 +40,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/io/easycourse/www/easycourse/activities/BaseActivity.java b/app/src/main/java/io/easycourse/www/easycourse/activities/BaseActivity.java
index 95f5a64..f85973d 100644
--- a/app/src/main/java/io/easycourse/www/easycourse/activities/BaseActivity.java
+++ b/app/src/main/java/io/easycourse/www/easycourse/activities/BaseActivity.java
@@ -3,7 +3,6 @@
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 
-import butterknife.ButterKnife;
 import io.easycourse.www.easycourse.EasyCourse;
 import io.easycourse.www.easycourse.models.main.User;
 import io.easycourse.www.easycourse.utils.SocketIO;
diff --git a/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java b/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java
index 42bb441..db0718e 100644
--- a/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java
+++ b/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java
@@ -15,25 +15,17 @@
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
-import android.view.KeyEvent;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ImageButton;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import io.easycourse.www.easycourse.EasyCourse;
-import io.easycourse.www.easycourse.R;
-import io.easycourse.www.easycourse.models.main.Language;
-import io.easycourse.www.easycourse.models.main.User;
-import io.easycourse.www.easycourse.utils.BitmapUtils;
-import io.easycourse.www.easycourse.utils.SocketIO;
-import io.easycourse.www.easycourse.utils.asyntasks.CompressImageTask;
-
 import com.squareup.picasso.Picasso;
 
 import org.json.JSONException;
@@ -42,6 +34,10 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import de.hdodenhof.circleimageview.CircleImageView;
+import io.easycourse.www.easycourse.R;
+import io.easycourse.www.easycourse.models.main.Language;
+import io.easycourse.www.easycourse.utils.BitmapUtils;
+import io.easycourse.www.easycourse.utils.asyntasks.CompressImageTask;
 import io.realm.Realm;
 import io.socket.client.Ack;
 
@@ -59,6 +55,10 @@ public class UserProfileActivity extends BaseActivity {
     Toolbar toolbar;
     @BindView(R.id.textViewUsername)
     TextView textViewUsername;
+    @BindView(R.id.textViewEmail)
+    TextView textViewEmail;
+    @BindView(R.id.emailContainerLinearLayout)
+    LinearLayout emailContainer;
     @BindView(R.id.editTextUsername)
     EditText editTextUsername;
     @BindView(R.id.saveChangesButton)
@@ -138,6 +138,10 @@ public void onImageLoadFailed(Picasso picasso, Uri uri, Exception exception) {
             }
             textViewUsername.setText(currentUser.getUsername());
             editTextUsername.setText(currentUser.getUsername());
+            if(currentUser.getEmail() != null){
+                emailContainer.setVisibility(View.VISIBLE);
+                textViewEmail.setText(currentUser.getEmail());
+            }
         }
 
 //        languageLabel.setText("Chosen language(s):");
@@ -372,4 +376,13 @@ public void run() {
         };
         thread.start();
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_userprofile.xml b/app/src/main/res/layout/activity_userprofile.xml
index 1c8fdfb..a70545a 100644
--- a/app/src/main/res/layout/activity_userprofile.xml
+++ b/app/src/main/res/layout/activity_userprofile.xml
@@ -105,6 +105,40 @@
 
         </android.support.v7.widget.CardView>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/emailContainerLinearLayout"
+            android:orientation="vertical"
+            android:visibility="gone">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:text="Email:" />
+
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:contentPadding="8dp"
+            android:backgroundTint="@color/colorGrayText">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/textViewEmail"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="test@test.com"
+                    android:textSize="18sp"/>
+
+            </RelativeLayout>
+
+        </android.support.v7.widget.CardView>
+        </LinearLayout>
     </LinearLayout>
 
     <android.support.design.widget.FloatingActionButton