diff --git a/build.gradle b/build.gradle
index 8de87bcc84..1301954a76 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,9 @@
 
 buildscript {
     repositories {
+        maven {
+            url 'https://dl.google.com/dl/android/maven2'
+        }
         jcenter()
         google()
     }
diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/DetailFragment.java b/omniNotes/src/main/java/it/feio/android/omninotes/DetailFragment.java
index d448a7bc33..209a8aba48 100644
--- a/omniNotes/src/main/java/it/feio/android/omninotes/DetailFragment.java
+++ b/omniNotes/src/main/java/it/feio/android/omninotes/DetailFragment.java
@@ -20,7 +20,9 @@
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.DatePickerDialog.OnDateSetListener;
+import android.app.SearchManager;
 import android.app.TimePickerDialog.OnTimeSetListener;
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
@@ -48,6 +50,7 @@
 import android.support.v4.util.Pair;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v4.widget.DrawerLayout;
+import android.support.v7.widget.SearchView;
 import android.text.Editable;
 import android.text.Selection;
 import android.text.TextUtils;
@@ -59,6 +62,7 @@
 import android.view.animation.Animation;
 import android.view.animation.Animation.AnimationListener;
 import android.view.animation.AnimationUtils;
+import android.view.inputmethod.EditorInfo;
 import android.widget.*;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -1102,6 +1106,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
 			case R.id.menu_note_info:
 				showNoteInfo();
 				break;
+			case R.id.menu_note_search:
+				searchInNote(item);
+				break;
 			default:
 				Log.w(Constants.TAG, "Invalid menu option selected");
 		}
@@ -1120,8 +1127,55 @@ private void showNoteInfo() {
 		startActivity(intent);
 
 	}
+	private void searchInNote(MenuItem item) {
+
+
+		noteTmp.setTitle(getNoteTitle());
+		noteTmp.setContent(getNoteContent());
+
+		android.support.v7.widget.SearchView search = (android.support.v7.widget.SearchView) item.getActionView();
+		search.requestFocus();
+		SearchManager searchManager = (SearchManager) mainActivity.getSystemService(Context.SEARCH_SERVICE);
+		search.setSearchableInfo(searchManager.getSearchableInfo(mainActivity.getComponentName()));
+		search.setImeOptions(EditorInfo.IME_ACTION_SEARCH);
+		search.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+			@Override
+			public boolean onQueryTextSubmit(String query) {
+
+				return false;
+			}
+
+			@Override
+			public boolean onQueryTextChange(String newText) {
+				if (!newText.isEmpty()) {
+					String NewNoteContent = search(newText);
 
-	private void navigateUp() {
+					noteTmp.setContent(NewNoteContent);
+					//View contentView = root.findViewById(R.id.detail_content);
+
+					//((EditText)contentView).setText(NewNoteContent);
+				}
+				noteTmp.setContent(newText);
+				return true;
+			}
+		});
+	}
+	private String search(String Searchkey)
+	{
+		String NoteContent= noteTmp.getContent();
+		Boolean check;
+		check= NoteContent.matches("(?i).*Searchkey.*");
+		if (check==true)
+		{
+			String newString = NoteContent.replaceAll(Searchkey, "<font color='red'>"+Searchkey+"</font>");
+			return newString;
+		}
+		else
+        {
+            return NoteContent;
+        }
+	}
+		private void navigateUp() {
 		afterSavedReturnsToList = true;
 		saveAndExit(this);
 	}
diff --git a/omniNotes/src/main/res/menu/menu_detail.xml b/omniNotes/src/main/res/menu/menu_detail.xml
index c972c1ff8b..55fa2bdbcd 100644
--- a/omniNotes/src/main/res/menu/menu_detail.xml
+++ b/omniNotes/src/main/res/menu/menu_detail.xml
@@ -103,6 +103,13 @@
         android:title="@string/untrash"
         android:visible="false"
         app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/menu_note_search"
+        android:icon="@drawable/ic_search_white_24dp"
+        android:orderInCategory="1200"
+        android:title="@string/search_in_note"
+        app:actionViewClass="android.support.v7.widget.SearchView"
+        app:showAsAction="collapseActionView|always" />
     <item
         android:id="@+id/menu_discard_changes"
         android:orderInCategory="1000"
diff --git a/omniNotes/src/main/res/values-ar-rSA/strings.xml b/omniNotes/src/main/res/values-ar-rSA/strings.xml
index 9534f77459..8ad412b3ab 100644
--- a/omniNotes/src/main/res/values-ar-rSA/strings.xml
+++ b/omniNotes/src/main/res/values-ar-rSA/strings.xml
@@ -391,4 +391,5 @@
   <string name="note_reminder_symbol">رمز تذكير الملاحظة</string>
   <string name="navigation_drawer_open">فتح قائمة الملاحة</string>
   <string name="navigation_drawer_close">إغلاق قائمة الملاحة</string>
+    <string name="search_in_note">Search</string>
 </resources>
diff --git a/omniNotes/src/main/res/values-ca-rES/strings.xml b/omniNotes/src/main/res/values-ca-rES/strings.xml
index 69c0f0b07f..abb2622fda 100644
--- a/omniNotes/src/main/res/values-ca-rES/strings.xml
+++ b/omniNotes/src/main/res/values-ca-rES/strings.xml
@@ -389,4 +389,5 @@
   <string name="note_reminder_symbol">símbol de recordatori de nota</string>
   <string name="navigation_drawer_open">Obre el tauler de navegació</string>
   <string name="navigation_drawer_close">Tanca el tauler de navegació</string>
+    <string name="search_in_note">Search</string>
 </resources>
diff --git a/omniNotes/src/main/res/values-cs-rCZ/strings.xml b/omniNotes/src/main/res/values-cs-rCZ/strings.xml
index 4df9023cf9..fcb6b3cc9a 100644
--- a/omniNotes/src/main/res/values-cs-rCZ/strings.xml
+++ b/omniNotes/src/main/res/values-cs-rCZ/strings.xml
@@ -389,4 +389,5 @@
   <string name="note_reminder_symbol">symbol připomenutí poznámky</string>
   <string name="navigation_drawer_open">Otevřít navigační lištu</string>
   <string name="navigation_drawer_close">Zavřít navigační lištu</string>
+    <string name="search_in_note">Search</string>
 </resources>
diff --git a/omniNotes/src/main/res/values-de-rDE/strings.xml b/omniNotes/src/main/res/values-de-rDE/strings.xml
index ddf4696242..83ac3e5cfb 100644
--- a/omniNotes/src/main/res/values-de-rDE/strings.xml
+++ b/omniNotes/src/main/res/values-de-rDE/strings.xml
@@ -389,4 +389,5 @@
   <string name="note_reminder_symbol">Erinnerungssymbol</string>
   <string name="navigation_drawer_open">Navigationsleiste öffnen</string>
   <string name="navigation_drawer_close">Navigationsleiste schließen</string>
+    <string name="search_in_note">Search</string>
 </resources>
diff --git a/omniNotes/src/main/res/values-el-rGR/strings.xml b/omniNotes/src/main/res/values-el-rGR/strings.xml
index 03305a6196..916797c6f8 100644
--- a/omniNotes/src/main/res/values-el-rGR/strings.xml
+++ b/omniNotes/src/main/res/values-el-rGR/strings.xml
@@ -389,4 +389,5 @@
   <string name="note_reminder_symbol">σύμβολο υπενθύμισης σημείωσης</string>
   <string name="navigation_drawer_open">Άνοιγμα μενού πλοήγησης</string>
   <string name="navigation_drawer_close">Κλείσιμο μενού πλοήγησης</string>
+    <string name="search_in_note">Search</string>
 </resources>
diff --git a/omniNotes/src/main/res/values-en-rUS/strings.xml b/omniNotes/src/main/res/values-en-rUS/strings.xml
index 75d77927b5..2fc44b66e8 100644
--- a/omniNotes/src/main/res/values-en-rUS/strings.xml
+++ b/omniNotes/src/main/res/values-en-rUS/strings.xml
@@ -389,4 +389,5 @@
   <string name="note_reminder_symbol">note reminder symbol</string>
   <string name="navigation_drawer_open">Open navigation drawer</string>
   <string name="navigation_drawer_close">Close navigation drawer</string>
+    <string name="search_in_note">Search</string>
 </resources>
diff --git a/omniNotes/src/main/res/values-es-rES/strings.xml b/omniNotes/src/main/res/values-es-rES/strings.xml
index 2eaa40889d..fb36644de2 100644
--- a/omniNotes/src/main/res/values-es-rES/strings.xml
+++ b/omniNotes/src/main/res/values-es-rES/strings.xml
@@ -390,4 +390,5 @@
   <string name="note_reminder_symbol">símbolo de recordatorio de nota</string>
   <string name="navigation_drawer_open">Abrir cajón de navegación</string>
   <string name="navigation_drawer_close">Cerrar cajón de navegación</string>
+    <string name="search_in_note">Search</string>
 </resources>
diff --git a/omniNotes/src/main/res/values/strings.xml b/omniNotes/src/main/res/values/strings.xml
index 0e9e49ccf7..738338655b 100644
--- a/omniNotes/src/main/res/values/strings.xml
+++ b/omniNotes/src/main/res/values/strings.xml
@@ -409,5 +409,6 @@
     <string name="note_reminder_symbol">note reminder symbol</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
+    <string name="search_in_note">Search</string>
 
 </resources>