diff --git a/app/build.gradle b/app/build.gradle
index c8188817f..fa86506fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -75,6 +75,7 @@ dependencies {
     compile 'commons-lang:commons-lang:2.6'
     compile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
     compile 'com.squareup.picasso:picasso:2.5.2'
+    compile 'com.github.amlcurran.showcaseview:library:5.4.3'
     compile('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') {
         transitive = true;
     }
diff --git a/app/src/debug/res/show_feature.xml b/app/src/debug/res/show_feature.xml
new file mode 100644
index 000000000..8b7914288
--- /dev/null
+++ b/app/src/debug/res/show_feature.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="40dp"
+        android:src="@drawable/privatechat"
+        android:layout_alignParentBottom="true" />
+
+    <TextView
+        android:layout_width="50dp"
+        android:layout_height="20dp"
+        android:id="@+id/private_chat"
+        android:layout_marginTop="60dp"
+        android:layout_marginLeft="80dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+    <TextView
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+
+        android:layout_marginTop="60dp"
+        android:layout_marginLeft="120dp"
+        android:id="@+id/press_button"
+        android:layout_alignParentTop="true"
+        android:layout_toRightOf="@+id/search_view"
+        android:layout_toEndOf="@+id/search_view" />
+
+    <TextView
+        android:layout_width="150dp"
+        android:layout_height="100dp"
+        android:id="@+id/results"
+        android:layout_marginLeft="80dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginBottom="200dp" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Continue"
+        android:id="@+id/button"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 56ef490d4..cc67ef6b9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zulip.android"
-    >
+    package="com.zulip.android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
@@ -32,6 +31,38 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+        </activity>
+
+        <activity
+            android:name=".activities.MessageExplain"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"
+            android:launchMode="singleTask" >
+
+        </activity>
+
+        <activity
+            android:name=".activities.ShowFeature"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"
+            android:launchMode="singleTask" >
+
+        </activity>
+        <activity
+            android:name=".activities.ChatBoxFeature"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"
+            android:launchMode="singleTask" >
+
+        </activity>
+
+        <activity
+            android:name=".activities.StreamPicker"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"
+            android:launchMode="singleTask" >
+
         </activity>
         <activity
             android:name=".activities.LoginActivity"
diff --git a/app/src/main/java/com/zulip/android/activities/ChatBoxFeature.java b/app/src/main/java/com/zulip/android/activities/ChatBoxFeature.java
new file mode 100644
index 000000000..11b14e24c
--- /dev/null
+++ b/app/src/main/java/com/zulip/android/activities/ChatBoxFeature.java
@@ -0,0 +1,63 @@
+package com.zulip.android.activities;
+
+
+/**
+ * Created by Minarva on 12-10-16.
+ */
+import android.app.ExpandableListActivity;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Paint;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextPaint;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.zulip.android.R;
+import com.github.amlcurran.showcaseview.ShowcaseView;
+import com.github.amlcurran.showcaseview.targets.ViewTarget;
+
+public class ChatBoxFeature extends AppCompatActivity {
+    ShowcaseView showcaseView;
+    TextView body;
+    int flag;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.chat_box_feature);
+        final Button startButton = (Button)findViewById(R.id.button);
+        final TextPaint titlePaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+        titlePaint.setTextSize(44.0f);
+
+        showcaseView = new ShowcaseView.Builder(this)
+                .withNewStyleShowcase()
+                .setTarget(new ViewTarget(R.id.chatbox, this))
+                .setContentTitle("Swipe left or right to remove the chat box")
+                .setStyle(R.style.CustomShowcaseTheme2)
+                .build();
+        flag = 0;
+        body = (TextView)findViewById(R.id.switch_stream);
+        startButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(flag == 0) {
+                    showcaseView = new ShowcaseView.Builder(ChatBoxFeature.this)
+                            .withNewStyleShowcase()
+                            .setTarget(new ViewTarget(R.id.switch_stream, ChatBoxFeature.this)).setContentTitlePaint(titlePaint)
+                            .setContentTitle("Press here to choose a stream")
+                            .setStyle(R.style.CustomShowcaseTheme2)
+                            .build();
+                    showcaseView.show();
+                    flag = 1;
+
+                }else{
+                    Intent i = new Intent(ChatBoxFeature.this, StreamPicker.class);
+                    startActivity(i);
+                }
+
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/zulip/android/activities/MessageExplain.java b/app/src/main/java/com/zulip/android/activities/MessageExplain.java
new file mode 100644
index 000000000..46593948e
--- /dev/null
+++ b/app/src/main/java/com/zulip/android/activities/MessageExplain.java
@@ -0,0 +1,50 @@
+package com.zulip.android.activities;
+
+/**
+ * Created by Minarva on 11-10-16.
+ */
+import android.app.ExpandableListActivity;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Paint;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextPaint;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.zulip.android.R;
+import com.github.amlcurran.showcaseview.ShowcaseView;
+import com.github.amlcurran.showcaseview.targets.ViewTarget;
+
+public class MessageExplain extends AppCompatActivity {
+    ShowcaseView showcaseView;
+    TextView body;
+    int flag;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.message_explain);
+        final Button startButton = (Button)findViewById(R.id.start_button);
+        final TextPaint titlePaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+        titlePaint.setTextSize(44.0f);
+
+        showcaseView = new ShowcaseView.Builder(this)
+                .withNewStyleShowcase()
+                .setTarget(new ViewTarget(R.id.more_options, this))
+                .setContentTitle("Long press on the Message to get more options")
+                .setStyle(R.style.CustomShowcaseTheme2)
+                .build();
+        flag = 0;
+        body = (TextView)findViewById(R.id.more_options);
+        startButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                    Intent i = new Intent(MessageExplain.this, ShowFeature.class);
+                    startActivity(i);
+
+            }
+        });
+    }
+}
diff --git a/app/src/main/java/com/zulip/android/activities/ShowFeature.java b/app/src/main/java/com/zulip/android/activities/ShowFeature.java
new file mode 100644
index 000000000..ba6fa22f8
--- /dev/null
+++ b/app/src/main/java/com/zulip/android/activities/ShowFeature.java
@@ -0,0 +1,54 @@
+package com.zulip.android.activities;
+
+/**
+ * Created by Minarva on 11-10-16.
+ */
+import android.app.ExpandableListActivity;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Paint;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextPaint;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.zulip.android.R;
+import com.github.amlcurran.showcaseview.ShowcaseView;
+import com.github.amlcurran.showcaseview.targets.ViewTarget;
+
+public class ShowFeature extends AppCompatActivity {
+    ShowcaseView showcaseView;
+    int flag;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.show_feature);
+        showcaseView = new ShowcaseView.Builder(this)
+                .withNewStyleShowcase()
+                .setTarget(new ViewTarget(R.id.results, this))
+                .setContentTitle("Swipe to the Left")
+                .setContentText("Find users' online status and start private chat")
+                .setStyle(R.style.CustomShowcaseTheme2)
+                .build();
+
+        flag = 0;
+        final Button startButton = (Button)findViewById(R.id.button);
+
+        startButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                {
+
+                      Intent i = new Intent(ShowFeature.this, ChatBoxFeature.class);
+                    startActivity(i);
+                }
+
+            }
+        });
+    }
+}
diff --git a/app/src/main/java/com/zulip/android/activities/StreamPicker.java b/app/src/main/java/com/zulip/android/activities/StreamPicker.java
new file mode 100644
index 000000000..c3a0c14a6
--- /dev/null
+++ b/app/src/main/java/com/zulip/android/activities/StreamPicker.java
@@ -0,0 +1,53 @@
+package com.zulip.android.activities;
+
+/**
+ * Created by Minarva on 11-10-16.
+ */
+import android.app.ExpandableListActivity;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Paint;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextPaint;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.zulip.android.R;
+import com.github.amlcurran.showcaseview.ShowcaseView;
+import com.github.amlcurran.showcaseview.targets.ViewTarget;
+
+public class StreamPicker extends AppCompatActivity {
+    ShowcaseView showcaseView;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.stream_picker);
+        showcaseView = new ShowcaseView.Builder(this)
+                .withNewStyleShowcase()
+                .setTarget(new ViewTarget(R.id.results, this))
+                .setContentText("Switch to a stream and start a chat")
+                .setStyle(R.style.CustomShowcaseTheme2)
+                .build();
+
+
+        final Button startButton = (Button)findViewById(R.id.button);
+
+        startButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                {
+
+                    Intent i = new Intent(StreamPicker.this, ZulipActivity.class);
+                    startActivity(i);
+                }
+
+            }
+        });
+    }
+}
diff --git a/app/src/main/java/com/zulip/android/activities/ZulipActivity.java b/app/src/main/java/com/zulip/android/activities/ZulipActivity.java
index 06edb20c8..2712f697e 100644
--- a/app/src/main/java/com/zulip/android/activities/ZulipActivity.java
+++ b/app/src/main/java/com/zulip/android/activities/ZulipActivity.java
@@ -1387,6 +1387,9 @@ public void onClick(
             case R.id.logout:
                 logout();
                 break;
+            case R.id.help:
+                openHelp();
+                break;
             case R.id.legal:
                 openLegal();
                 break;
@@ -1436,7 +1439,10 @@ private void openLegal() {
         startActivityForResult(i, 0);
     }
 
-    public void onConfigurationChanged(Configuration newConfig) {
+    private void openHelp() {
+        Intent i = new Intent(this,MessageExplain.class);
+        startActivity(i);
+}   public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
 
         // our display has changed, lets recalculate the spacer
diff --git a/app/src/main/res/drawable-hdpi/message.png b/app/src/main/res/drawable-hdpi/message.png
new file mode 100644
index 000000000..839f8f92f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/message.png differ
diff --git a/app/src/main/res/drawable-hdpi/privatechat.png b/app/src/main/res/drawable-hdpi/privatechat.png
new file mode 100644
index 000000000..686dc1d50
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/privatechat.png differ
diff --git a/app/src/main/res/drawable/chatbox.png b/app/src/main/res/drawable/chatbox.png
new file mode 100644
index 000000000..21a0b533e
Binary files /dev/null and b/app/src/main/res/drawable/chatbox.png differ
diff --git a/app/src/main/res/drawable/dragleft.png b/app/src/main/res/drawable/dragleft.png
new file mode 100644
index 000000000..5ac95212c
Binary files /dev/null and b/app/src/main/res/drawable/dragleft.png differ
diff --git a/app/src/main/res/drawable/dragleftright.jpg b/app/src/main/res/drawable/dragleftright.jpg
new file mode 100644
index 000000000..89297b8da
Binary files /dev/null and b/app/src/main/res/drawable/dragleftright.jpg differ
diff --git a/app/src/main/res/drawable/streampicker.png b/app/src/main/res/drawable/streampicker.png
new file mode 100644
index 000000000..e9b23b364
Binary files /dev/null and b/app/src/main/res/drawable/streampicker.png differ
diff --git a/app/src/main/res/layout/chat_box_feature.xml b/app/src/main/res/layout/chat_box_feature.xml
new file mode 100644
index 000000000..c43af264f
--- /dev/null
+++ b/app/src/main/res/layout/chat_box_feature.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/chatbox"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_above="@+id/button"
+        android:id="@+id/imageView3" />
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/dragleftright"
+        android:layout_alignParentBottom="true"
+        android:layout_toEndOf="@+id/chatbox"
+        android:layout_alignTop="@+id/chatbox"
+        android:layout_toRightOf="@+id/chatbox" />
+
+    <TextView
+        android:layout_width="150dp"
+        android:layout_height="100dp"
+        android:id="@+id/chatbox"
+        android:layout_above="@+id/button"
+        android:layout_alignRight="@+id/button"
+        android:layout_alignEnd="@+id/button" />
+
+    <TextView
+        android:layout_width="150dp"
+        android:layout_height="100dp"
+        android:id="@+id/switch_stream"
+        android:layout_alignParentTop="true"
+        android:layout_toLeftOf="@+id/button"
+        android:layout_toStartOf="@+id/button" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Continue"
+        android:id="@+id/button"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/message_explain.xml b/app/src/main/res/layout/message_explain.xml
new file mode 100644
index 000000000..08f196cdb
--- /dev/null
+++ b/app/src/main/res/layout/message_explain.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/message"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true" />
+
+    <TextView
+        android:layout_width="70dp"
+        android:layout_height="20dp"
+        android:id="@+id/more_options"
+        android:layout_centerVertical="true"
+        android:layout_centerHorizontal="true" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Continue"
+        android:id="@+id/start_button"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/show_feature.xml b/app/src/main/res/layout/show_feature.xml
new file mode 100644
index 000000000..c8774da5a
--- /dev/null
+++ b/app/src/main/res/layout/show_feature.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/privatechat"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_above="@+id/button" />
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/dragleft"
+        android:id="@+id/imageView"
+        android:layout_toRightOf="@+id/button"
+        android:layout_toEndOf="@+id/button" />
+
+    <TextView
+        android:layout_width="150dp"
+        android:layout_height="100dp"
+        android:id="@+id/results"
+        android:layout_centerVertical="true"
+        android:layout_alignLeft="@+id/button"
+        android:layout_alignStart="@+id/button" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Continue"
+        android:id="@+id/button"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/stream_picker.xml b/app/src/main/res/layout/stream_picker.xml
new file mode 100644
index 000000000..dee154027
--- /dev/null
+++ b/app/src/main/res/layout/stream_picker.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/streampicker"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_above="@+id/button" />
+
+
+    <TextView
+        android:layout_width="150dp"
+        android:layout_height="100dp"
+        android:id="@+id/results"
+        android:layout_alignParentTop="true"
+        android:layout_alignRight="@+id/button"
+        android:layout_alignEnd="@+id/button"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Get Started"
+        android:id="@+id/button"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/options.xml b/app/src/main/res/menu/options.xml
index 466382435..f951206ce 100644
--- a/app/src/main/res/menu/options.xml
+++ b/app/src/main/res/menu/options.xml
@@ -32,6 +32,9 @@
     <item
         android:id="@+id/logout"
         android:title="@string/logout" />
+    <item
+        android:id="@+id/help"
+        android:title="Help" />
     <item
         android:id="@+id/legal"
         android:title="@string/legal" />
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 000000000..024f71e1d
--- /dev/null
+++ b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,44 @@
+<resources>
+
+
+
+    <style name="CustomShowcaseTheme" parent="ShowcaseView.Light">
+        <item name="sv_backgroundColor">#FFFF00</item>
+        <item name="sv_showcaseColor">#00801A</item>
+        <item name="sv_buttonText">Hide</item>
+        <item name="sv_tintButtonColor">false</item>
+        <item name="sv_titleTextAppearance">@style/CustomTitle</item>
+    </style>
+
+    <style name="CustomShowcaseTheme2" parent="ShowcaseView">
+        <item name="sv_backgroundColor">#FFE4B5</item>
+        <item name="sv_showcaseColor">#25467A</item>
+        <item name="sv_buttonText">Close</item>
+        <item name="sv_titleTextAppearance">@style/CustomTitle2</item>
+        <item name="sv_detailTextAppearance">@style/CustomText2</item>
+    </style>
+
+    <style name="CustomShowcaseTheme3" parent="ShowcaseView.Light">
+        <item name="sv_backgroundColor">#c8ed680f</item>
+        <item name="sv_showcaseColor">#FFE4B5</item>
+        <item name="sv_buttonText">Hide</item>
+        <item name="sv_tintButtonColor">false</item>
+        <item name="sv_titleTextAppearance">@style/CustomTitle2</item>
+        <item name="sv_detailTextAppearance">@style/CustomText2</item>
+    </style>
+
+    <style name="CustomTitle" parent="TextAppearance.ShowcaseView.Title">
+        <item name="android:textColor">#00801A</item>
+    </style>
+
+
+    <style name="CustomTitle2" parent="TextAppearance.ShowcaseView.Title.Light">
+        <item name="android:textColor">#000000</item>
+    </style>
+
+    <style name="CustomText2" parent="TextAppearance.ShowcaseView.Detail.Light">
+        <item name="android:textColor">#000000</item>
+    </style>
+
+
+</resources>