diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
index 12ace6b3b..7f59c1e54 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.upload;
 
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
@@ -8,8 +9,10 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -22,8 +25,10 @@ import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import java.util.ArrayList;
 
@@ -175,6 +180,8 @@ public class SingleUploadFragment extends Fragment {
         editor.commit();
     }
 
+
+
     @OnTouch(R.id.share_license_summary) boolean showLicence(View view, MotionEvent motionEvent) {
         if (motionEvent.getActionMasked() == MotionEvent.ACTION_DOWN) {
             Intent intent = new Intent();
@@ -198,6 +205,65 @@ public class SingleUploadFragment extends Fragment {
         descEdit.setText(desc);
     }
 
+    /**
+     * Copied from https://stackoverflow.com/a/26269435/8065933
+     * @param view
+     * @param motionEvent
+     * @return
+     */
+    @OnTouch(R.id.titleEdit) boolean titleInfo(View view, MotionEvent motionEvent){
+
+        final int DRAWABLE_RIGHT = 2;
+
+        if(motionEvent.getAction() == MotionEvent.ACTION_UP) {
+            if(motionEvent.getRawX() >= (titleEdit.getRight() - titleEdit.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width())) {
+
+                AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                builder.setTitle(R.string.media_detail_title);
+                builder.setMessage(R.string.title_info);
+                builder.setCancelable(true);
+                builder.setNeutralButton(android.R.string.ok,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                dialog.cancel();
+                            }
+                        });
+
+                AlertDialog alert = builder.create();
+                alert.show();
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @OnTouch(R.id.descEdit) boolean descriptionInfo(View view, MotionEvent motionEvent){
+
+        final int DRAWABLE_RIGHT = 2;
+
+        if(motionEvent.getAction() == MotionEvent.ACTION_UP) {
+            if(motionEvent.getRawX() >= (titleEdit.getRight() - titleEdit.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width())) {
+
+                AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                builder.setTitle(R.string.media_detail_description);
+                builder.setMessage(R.string.description_info);
+                builder.setCancelable(true);
+                builder.setNeutralButton(android.R.string.ok,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                dialog.cancel();
+                            }
+                        });
+
+                AlertDialog alert = builder.create();
+                alert.show();
+                return true;
+            }
+        }
+        return false;
+    }
+
+
     private void setLicenseSummary(String license) {
         licenseSummaryView.setText(getString(R.string.share_license_summary, getString(Utils.licenseNameFor(license))));
     }
diff --git a/app/src/main/res/layout/fragment_single_upload.xml b/app/src/main/res/layout/fragment_single_upload.xml
index 911943116..dad6ce91f 100644
--- a/app/src/main/res/layout/fragment_single_upload.xml
+++ b/app/src/main/res/layout/fragment_single_upload.xml
@@ -18,20 +18,22 @@
         android:id="@+id/titleEdit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:drawableEnd="@drawable/mapbox_info_icon_default"
+        android:drawableRight="@drawable/mapbox_info_icon_default"
         android:scrollHorizontally="false"
         android:maxLines="1"
         android:hint="@string/share_title_hint"
-        android:imeOptions="flagNoExtractUi"
-        />
+        android:imeOptions="flagNoExtractUi" />
 
     <EditText
         android:id="@+id/descEdit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:drawableEnd="@drawable/mapbox_info_icon_default"
+        android:drawableRight="@drawable/mapbox_info_icon_default"
         android:inputType="textMultiLine"
         android:hint="@string/share_description_hint"
-        android:imeOptions="flagNoExtractUi"
-        />
+        android:imeOptions="flagNoExtractUi" />
 
     <Spinner
         android:id="@+id/licenseSpinner"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1979c60b0..d7f0b99ee 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -204,5 +204,7 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="nearby_info_menu_commons_article">Commons file page</string>
   <string name="nearby_info_menu_wikidata_article">Wikidata item</string>
     <string name="error_while_cache">Error while caching pictures</string>
+    <string name="title_info">A unique descriptive title for the file, which will serve as a filename. You may use plain language with spaces. Do not include the file extension</string>
+  <string name="description_info">Please describe the media as much as possible: Where was it taken? What does it show? What is the context? Please describe the objects or persons. Reveal information that can not be easily guessed, for instance the time of day if it is a landscape. If the media shows something unusual, please explain what makes it unusual.</string>
 
 </resources>