diff --git a/app/build.gradle b/app/build.gradle
index 2f2717e..62a6426 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.github.axet.audiorecorder"
         minSdkVersion 9
         targetSdkVersion 23 // 24+ file:// unable to open
-        versionCode 238
-        versionName "3.1.7"
+        versionCode 239
+        versionName "3.1.8"
     }
     signingConfigs {
         release {
@@ -55,5 +55,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.github.axet:android-audio-library:1.0.78' // compile project(':android-audio-library')
+    compile 'com.github.axet:android-audio-library:1.0.80' // compile project(':android-audio-library')
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index fedb26f..298e383 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -22,6 +22,8 @@
 -keep class com.github.axet.lamejni.Lame {*;}
 -keep class com.github.axet.opusjni.Opus {*;}
 
+-keep class com.github.axet.androidlibrary.widgets.SearchView {*;}
+
 -dontwarn net.sourceforge.javaflacencoder.**
 -dontwarn com.jssrc.resample.**
 -dontwarn org.apache.commons.**
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ba7e052..8e41499 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,6 +32,9 @@
             android:label="@string/app_name"
             android:launchMode="singleInstance"
             android:theme="@style/RecThemeLight.NoActionBar">
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
index 0d87d3f..84f7078 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
@@ -27,6 +27,7 @@ import android.widget.Toast;
 
 import com.github.axet.androidlibrary.services.StorageProvider;
 import com.github.axet.androidlibrary.widgets.AboutPreferenceCompat;
+import com.github.axet.androidlibrary.widgets.SearchView;
 import com.github.axet.audiolibrary.app.Recordings;
 import com.github.axet.audiolibrary.app.Storage;
 import com.github.axet.audiorecorder.R;
@@ -136,6 +137,29 @@ public class MainActivity extends AppCompatActivity {
             item.setVisible(false);
         }
 
+        MenuItem search = menu.findItem(R.id.action_search);
+        final SearchView searchView = (SearchView) search.getActionView();
+        searchView.setOnQueryTextListener(new android.support.v7.widget.SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                searchView.clearFocus();
+                recordings.search(query);
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                return false;
+            }
+        });
+        searchView.setOnCloseListener(new SearchView.OnCloseListener() {
+            @Override
+            public boolean onClose() {
+                recordings.searchClose();
+                return true;
+            }
+        });
+
         return true;
     }
 
diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/BluetoothReceiver.java b/app/src/main/java/com/github/axet/audiorecorder/services/BluetoothReceiver.java
index fef2355..5c3b5ab 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/services/BluetoothReceiver.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/services/BluetoothReceiver.java
@@ -14,7 +14,7 @@ import com.github.axet.audiorecorder.R;
 import com.github.axet.audiorecorder.activities.RecordingActivity;
 import com.github.axet.audiorecorder.app.MainApplication;
 
-// default bluetooth stack for API25, bugged and has to be cleared.
+// default bluetooth stack for API25 bugged and has to be cleared using this Receiver.
 public class BluetoothReceiver extends BroadcastReceiver {
 
     public static int CONNECT_DELAY = 3000; // give os time ot initialize device, or startBluetoothSco will be ignored
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index b2462ea..52dc26b 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -2,6 +2,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".activities.MainActivity">
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_search_white_24dp"
+        android:title="@string/menu_search"
+        app:actionViewClass="com.github.axet.androidlibrary.widgets.SearchView"
+        app:showAsAction="collapseActionView|ifRoom" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c7892e4..98cdde9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -64,4 +64,5 @@
     <string name="pref_fly_title">Encoding on Fly</string>
     <string name="pref_fly_summary">Encoding on fly disable editing, and crash recovery</string>
     <string name="hold_by_bluetooth">pause (bluetooth disconnected)</string>
+    <string name="menu_search">Search</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ce2a630..699b5e4 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -64,4 +64,5 @@
     <string name="pref_fly_title">Encoding on Fly</string>
     <string name="pref_fly_summary">Encoding on fly disable editing, and crash recovery</string>
     <string name="hold_by_bluetooth">pause (bluetooth disconnected)</string>
+    <string name="menu_search">Search</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 898215d..5566108 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -64,4 +64,5 @@
     <string name="pref_fly_title">Encoding on Fly</string>
     <string name="pref_fly_summary">Encoding on fly disable editing, and crash recovery</string>
     <string name="hold_by_bluetooth">pause (bluetooth disconnected)</string>
+    <string name="menu_search">Search</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 026fc05..e4023bf 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -64,4 +64,5 @@
     <string name="pref_fly_title">Encoding on Fly</string>
     <string name="pref_fly_summary">Encoding on fly disable editing, and crash recovery</string>
     <string name="hold_by_bluetooth">pause (bluetooth disconnected)</string>
+    <string name="menu_search">Search</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 56d3348..d670bde 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -64,4 +64,5 @@
     <string name="pref_fly_title">Encoding on Fly</string>
     <string name="pref_fly_summary">Encoding on fly disable editing, and crash recovery</string>
     <string name="hold_by_bluetooth">pause (bluetooth disconnected)</string>
+    <string name="menu_search">Search</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2b69bc6..230c117 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -64,4 +64,5 @@
     <string name="pref_recordings">Записи</string>
     <string name="pref_fly_title">Кодирование на лету</string>
     <string name="pref_fly_summary">Кодирование на лету отключает редактирование и восстановление в случае ошибок</string>
+    <string name="menu_search">Поиск</string>
 </resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 9a8eded..c164fc6 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -64,4 +64,5 @@
     <string name="pref_fly_title">Encoding on Fly</string>
     <string name="pref_fly_summary">Encoding on fly disable editing, and crash recovery</string>
     <string name="hold_by_bluetooth">pause (bluetooth disconnected)</string>
+    <string name="menu_search">Search</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6e97549..35ddaca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -101,4 +101,5 @@
     <string name="pref_fly_title">Encoding on Fly</string>
     <string name="pref_fly_summary">Enabling encoding on fly disables editing, and crash recovery</string>
     <string name="hold_by_bluetooth">pause (bluetooth disconnected)</string>
+    <string name="menu_search">Search</string>
 </resources>