diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
index 2f4cba0..7f28ea3 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
@@ -3,6 +3,7 @@ package com.uam.wmi.findmytutor.activity;
 import android.Manifest;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
@@ -76,17 +77,17 @@ public abstract class BaseActivity
                      if (itemName.equals(getResources().getString(R.string.navigation_item_whitelist)))  {
                         /* launchIntent = new Intent(getApplicationContext(), WhitelistActivity.class);
                         startActivity(launchIntent);*/
-                    } else if (itemName.equals(getResources().getString(R.string.navigation_item_blacklist))) {
+                     } else if (itemName.equals(getResources().getString(R.string.navigation_item_blacklist))) {
                         /* launchIntent = new Intent(getApplicationContext(), BlacklistActivity.class);
                         startActivity(launchIntent);*/
-                    } else if (itemName.equals(getResources().getString(R.string.navigation_item_profile)))  {
+                     } else if (itemName.equals(getResources().getString(R.string.navigation_item_profile)))  {
                         /* launchIntent = new Intent(getApplicationContext(), ProfileActivity.class);
                         startActivity(launchIntent);*/
-                    } else if (itemName.equals(getResources().getString(R.string.navigation_item_settings))) {
+                     } else if (itemName.equals(getResources().getString(R.string.navigation_item_settings))) {
                         launchIntent = new Intent(getApplicationContext(), SettingsActivity.class);
                         startActivity(launchIntent);
 
-                    } else if (itemName.equals(getResources().getString(R.string.navigation_item_logout))) {
+                     } else if (itemName.equals(getResources().getString(R.string.navigation_item_logout))) {
                         if(PrefUtils.isBackgroundLocationServiceRunning(getApplicationContext()))                        {
                             stopBackgroundLocalizationTask();
                         }
@@ -101,8 +102,13 @@ public abstract class BaseActivity
                         }
                         startActivity(i);
                         finish();
+                     } else if (itemName.equals(getResources().getString(R.string.navigation_item_feedback))) {
+                         sendFeedback(getApplicationContext());
 
-                    }
+                     } else if (itemName.equals(getResources().getString(R.string.navigation_item_bug))) {
+
+
+                     }
 
                     sideDrawer.closeDrawers();
 
@@ -351,6 +357,28 @@ public abstract class BaseActivity
         MenuItem item = navigationView.getMenu().findItem(itemId);
         item.setChecked(true);
     }
+    /**
+     * Email client intent to send support mail
+     * Appends the necessary device information to email body
+     * useful when providing support
+     */
+    static public void sendFeedback(Context context) {
+        String body = null;
+        try {
+            body = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
+            body = "\n\n-----------------------------\nPlease don't remove this information\n Device OS: Android \n Device OS version: " +
+                    Build.VERSION.RELEASE + "\n App Version: " + body + "\n Device Brand: " + Build.BRAND +
+                    "\n Device Model: " + Build.MODEL + "\n Device Manufacturer: " + Build.MANUFACTURER;
+        } catch (PackageManager.NameNotFoundException e) {
+        }
+        Intent intent = new Intent(Intent.ACTION_SEND);
+        intent.setType("message/rfc822");
+        intent.putExtra(Intent.EXTRA_EMAIL, new String[]{"team@findmytutor.com"});
+        intent.putExtra(Intent.EXTRA_SUBJECT, "Query from android app");
+        intent.putExtra(Intent.EXTRA_TEXT, body);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(Intent.createChooser(intent, context.getString(R.string.choose_email_client)));
+    }
 
     abstract int getNavigationMenuItemId();