diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog
index 04801cd682..343507a99c 100644
--- a/extras/pandroid_event_viewer/ChangeLog
+++ b/extras/pandroid_event_viewer/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-24 Santiago Munín <burning1@gmail.com>
+	* src/pandroid_event_viewer/pandorafms/Main.java: Added search profiles feature.
+	* res/layout/main.xml: UI changes. Added search profiles feature.
+	* res/values/strings.xml: Added new entries.
+
 2012-06-23 Santiago Munín <burning1@gmail.com>
 	* src/pandroid_event_viewer/pandorafms/Core.java: Fixed a bug in the isOnline() function.
 	* src/pandroid_event_viewer/pandorafms/Options.java: Improved the connection checking functionality.
diff --git a/extras/pandroid_event_viewer/res/layout/main.xml b/extras/pandroid_event_viewer/res/layout/main.xml
index ddbe213d22..6bcb2d45c9 100644
--- a/extras/pandroid_event_viewer/res/layout/main.xml
+++ b/extras/pandroid_event_viewer/res/layout/main.xml
@@ -28,6 +28,30 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content" >
 
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:paddingRight="5dip"
+                    android:textStyle="bold"
+                    android:text="@string/profile_label_str" />
+
+                <Spinner
+                    android:id="@+id/profile_combo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+                <ImageView 
+                    android:src="@drawable/cross"
+                    android:contentDescription="@string/profile_delete"
+                    android:id="@+id/delete_profile"
+                    />
+            </TableRow>
+
             <TableRow
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
@@ -192,32 +216,49 @@
             android:layout_marginTop="10dp"
             android:background="#ffffff" />
 
-        <LinearLayout
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="horizontal" >
-
-            <Button
-                android:id="@+id/button_reset"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/reset_button_str" />
-
-            <Button
-                android:id="@+id/button_send"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/search_button_str" />
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/button_set_as_filter_watcher"
+        <TableLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/set_as_filter_watcher_button_str" />
+            android:stretchColumns="0,1" >
+
+            <TableRow
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" >
+
+                <Button
+                    android:id="@+id/button_reset"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/reset_button_str" />
+
+                <Button
+                    android:id="@+id/button_send"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/search_button_str" />
+            </TableRow>
+
+            <TableRow
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" >
+
+                <Button
+                    android:id="@+id/button_save_profile"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/save_profile_button_str" />
+
+                <Button
+                    android:id="@+id/button_set_as_filter_watcher"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/set_as_filter_watcher_button_str" />
+            </TableRow>
+        </TableLayout>
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/extras/pandroid_event_viewer/res/values/strings.xml b/extras/pandroid_event_viewer/res/values/strings.xml
index d421cc7551..c07566e927 100644
--- a/extras/pandroid_event_viewer/res/values/strings.xml
+++ b/extras/pandroid_event_viewer/res/values/strings.xml
@@ -48,7 +48,7 @@
     <string name="load_more_events_button_str">Load more events</string>
     <string name="empty_label_str">Empty list events</string>
     <string name="refresh_time_label_str">Refresh time</string>
-    <string name="set_as_filter_watcher_button_str">Filter by default</string>
+    <string name="set_as_filter_watcher_button_str">Default</string>
     <string name="validate_event_button_str">Validate Event</string>
     <string name="config_update_succesful_str">Update configuration successful.</string>
     <string name="config_update_fail_str">Update configuration is failed.</string>
@@ -121,4 +121,11 @@
 	<string name="certificate_not_valid">This server has a certificate not signed by a CA, do you trust it?</string>
 	<string name="options_not_saved">Options not saved.</string>
 	<string name="notification_error_parsing">There was an error retrieving data from server.</string>
+	<string name="save_profile_button_str">Save profile</string>
+	<string name="profile_label_str">Profile</string>
+	<string name="profile_name">Insert the profile\'s name</string>
+	<string name="profile_saved">Profile saved</string>
+	<string name="profile_already_exists">A profile with that name already exists.</string>
+	<string name="profile_name_character_not_allowed">The | character is not allowed.</string>
+	<string name="profile_delete">Delete profile</string>
 </resources>
\ No newline at end of file
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java
index 70d53252c2..39e3b3095d 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java
@@ -19,6 +19,7 @@ package pandroid_event_viewer.pandorafms;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -27,7 +28,10 @@ import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.TabActivity;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
@@ -38,12 +42,16 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.Spinner;
@@ -57,9 +65,13 @@ import android.widget.Toast;
  */
 public class Main extends Activity {
 	private static String TAG = "MAIN";
+	private static String PROFILE_PREFIX = "profile:";
 	private PandroidEventviewerActivity object;
 	private HashMap<Integer, String> pandoraGroups;
 	private Spinner comboSeverity;
+	private List<String> profiles;
+	private Context context = this;
+	private boolean selectLastProfile = false;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -72,11 +84,10 @@ public class Main extends Activity {
 		this.pandoraGroups = new HashMap<Integer, String>();
 
 		setContentView(R.layout.main);
-
 		final Button buttonReset = (Button) findViewById(R.id.button_reset);
 		final Button buttonSearch = (Button) findViewById(R.id.button_send);
 		final Button buttonbuttonSetAsFilterWatcher = (Button) findViewById(R.id.button_set_as_filter_watcher);
-
+		final Button buttonSaveProfile = (Button) findViewById(R.id.button_save_profile);
 		// Check if the user preferences it is set.
 		if (object.user.length() == 0 || object.password.length() == 0
 				|| object.url.length() == 0) {
@@ -122,6 +133,33 @@ public class Main extends Activity {
 		combo.setAdapter(adapter);
 		combo.setSelection(3);
 
+		loadProfiles();
+		combo = (Spinner) findViewById(R.id.profile_combo);
+		combo.setOnItemSelectedListener(new OnItemSelectedListener() {
+
+			@Override
+			public void onItemSelected(AdapterView<?> parent, View view,
+					int pos, long id) {
+				String selected = parent.getItemAtPosition(pos).toString();
+				setProfile(selected);
+			}
+
+			@Override
+			public void onNothingSelected(AdapterView<?> arg0) {
+			}
+		});
+		((ImageView) findViewById(R.id.delete_profile))
+				.setOnClickListener(new OnClickListener() {
+
+					@Override
+					public void onClick(View v) {
+						String profileName = ((Spinner) findViewById(R.id.profile_combo))
+								.getSelectedItem().toString();
+						deleteProfile(profileName);
+						loadProfiles();
+					}
+				});
+
 		combo = (Spinner) findViewById(R.id.max_time_old_event_combo);
 		adapter = ArrayAdapter.createFromResource(this,
 				R.array.max_time_old_event_values,
@@ -152,6 +190,51 @@ public class Main extends Activity {
 						save_filter_watcher();
 					}
 				});
+		buttonSaveProfile.setOnClickListener(new OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				final EditText profileName = new EditText(getBaseContext());
+				DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						switch (which) {
+						case DialogInterface.BUTTON_POSITIVE:
+							/*
+							 * if (profiles.contains(profileName.getText()
+							 * .toString())) { Toast.makeText(context,
+							 * R.string.profile_already_exists,
+							 * Toast.LENGTH_SHORT).show(); break; }
+							 */
+							if (profileName.getText().toString().contains("|")) {
+								Toast.makeText(
+										context,
+										R.string.profile_name_character_not_allowed,
+										Toast.LENGTH_SHORT).show();
+								break;
+							}
+							saveProfile(profileName.getText().toString());
+							Toast.makeText(context, R.string.profile_saved,
+									Toast.LENGTH_SHORT).show();
+							loadProfiles();
+							dialog.cancel();
+							break;
+
+						case DialogInterface.BUTTON_NEGATIVE:
+							dialog.cancel();
+							break;
+						}
+					}
+				};
+				AlertDialog.Builder builder = new AlertDialog.Builder(context);
+				builder.setView(profileName);
+				builder.setMessage(R.string.profile_name)
+						.setPositiveButton(android.R.string.yes,
+								dialogClickListener)
+						.setNegativeButton(android.R.string.no,
+								dialogClickListener).show();
+			}
+		});
 		LinearLayout advancedOptions = (LinearLayout) findViewById(R.id.show_hide_layout);
 		// Show advanced options?
 		if (preferences.getBoolean("show_advanced", false)) {
@@ -527,4 +610,155 @@ public class Main extends Activity {
 		editorPreferences.putBoolean("filterChanges", true);
 		editorPreferences.commit();
 	}
+
+	/**
+	 * Saves a search profile in SharedPreferences
+	 */
+	private void saveProfile(String profileName) {
+		int group = ((Spinner) findViewById(R.id.group_combo))
+				.getSelectedItemPosition();
+		int status = ((Spinner) findViewById(R.id.status_combo))
+				.getSelectedItemPosition();
+		int tag = ((Spinner) findViewById(R.id.tag)).getSelectedItemPosition();
+		String agentName = ((EditText) findViewById(R.id.agent_name)).getText()
+				.toString();
+		String eventSearch = ((EditText) findViewById(R.id.event_search_text))
+				.getText().toString();
+		int severity = ((Spinner) findViewById(R.id.severity_combo))
+				.getSelectedItemPosition();
+		int oldestEvent = ((Spinner) findViewById(R.id.max_time_old_event_combo))
+				.getSelectedItemPosition();
+		SharedPreferences preferences = getSharedPreferences(
+				this.getString(R.string.const_string_preferences),
+				Activity.MODE_PRIVATE);
+		SharedPreferences.Editor editorPreferences = preferences.edit();
+		// Profile
+		editorPreferences.putString(PROFILE_PREFIX + profileName, group + "|"
+				+ status + "|" + tag + "|" + agentName + "|" + eventSearch
+				+ "|" + severity + "|" + oldestEvent);
+		// Add to profiles
+		String allProfiles = preferences.getString("allProfiles", "");
+		if (allProfiles.length() > 0) {
+			allProfiles = allProfiles + "|";
+		}
+		allProfiles = allProfiles + profileName;
+		editorPreferences.putString("allProfiles", allProfiles);
+		if (editorPreferences.commit()) {
+			selectLastProfile = true;
+			Log.i(TAG, "New search profile saved.");
+		}
+	}
+
+	/**
+	 * Gets the list of search profiles (only names).
+	 * 
+	 * @return a list with all search profiles.
+	 */
+	private List<String> getAllProfiles() {
+		SharedPreferences preferences = getSharedPreferences(
+				this.getString(R.string.const_string_preferences),
+				Activity.MODE_PRIVATE);
+		List<String> result = new LinkedList<String>();
+		String allProfiles = preferences.getString("allProfiles", "");
+		if (allProfiles.length() > 0) {
+			String[] profiles = allProfiles.split("\\|");
+			for (int i = 0; i < profiles.length; i++) {
+				result.add(profiles[i]);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Fill all fields with profile's options.
+	 * 
+	 * @param profileName
+	 *            Profile name.
+	 */
+	private void setProfile(String profileName) {
+		SharedPreferences preferences = getSharedPreferences(
+				this.getString(R.string.const_string_preferences),
+				Activity.MODE_PRIVATE);
+		String profileData = preferences.getString(
+				PROFILE_PREFIX + profileName, "");
+		String options[] = profileData.split("\\|");
+		if (options.length == 7) {
+			try {
+				Spinner spinner = (Spinner) findViewById(R.id.group_combo);
+				spinner.setSelection(Integer.valueOf(options[0]));
+				spinner = (Spinner) findViewById(R.id.status_combo);
+				spinner.setSelection(Integer.valueOf(options[1]));
+				spinner = (Spinner) findViewById(R.id.tag);
+				spinner.setSelection(Integer.valueOf(options[2]));
+				EditText editText = (EditText) findViewById(R.id.agent_name);
+				editText.setText(options[3]);
+				editText = (EditText) findViewById(R.id.event_search_text);
+				editText.setText(options[4]);
+				spinner = (Spinner) findViewById(R.id.severity_combo);
+				spinner.setSelection(Integer.valueOf(options[5]));
+				spinner = (Spinner) findViewById(R.id.max_time_old_event_combo);
+				spinner.setSelection(Integer.valueOf(options[6]));
+			} catch (NumberFormatException ne) {
+				Log.e(TAG, "NumberFormatException parsing profile");
+				return;
+			} catch (IndexOutOfBoundsException ie) {
+				Log.e(TAG,
+						"IndexOutOfBoundsException (maybe groups or tags are not correctly loaded)");
+				return;
+			}
+		}
+	}
+
+	/**
+	 * Removes a profile.
+	 * 
+	 * @param profileName
+	 */
+	private void deleteProfile(String profileName) {
+		SharedPreferences preferences = getSharedPreferences(
+				this.getString(R.string.const_string_preferences),
+				Activity.MODE_PRIVATE);
+		SharedPreferences.Editor editorPreferences = preferences.edit();
+		editorPreferences.remove(PROFILE_PREFIX + profileName);
+		String profiles = preferences.getString("allProfiles", "");
+		int firstPos = profiles.indexOf(profileName);
+		int amount = profileName.length();
+		if (firstPos != 0) {
+			// Includes the separator char
+			firstPos--;
+			amount++;
+		}
+		profiles = profiles.substring(0, firstPos)
+				+ profiles.substring(firstPos + amount);
+		if (profiles.startsWith("|")) {
+			if (profiles.length() > 1) {
+				profiles = profiles.substring(1);
+			} else {
+				profiles = "";
+			}
+		}
+		editorPreferences.putString("allProfiles", profiles);
+		if (editorPreferences.commit()) {
+			Log.i(TAG, "Removed profile: " + profileName);
+		}
+	}
+
+	/**
+	 * Fetches all profiles and fills the profile combo.
+	 */
+	private void loadProfiles() {
+		profiles = new LinkedList<String>();
+		profiles.add("");
+		profiles.addAll(getAllProfiles());
+		Spinner combo = (Spinner) findViewById(R.id.profile_combo);
+		ArrayAdapter<String> adapter = new ArrayAdapter<String>(
+				getApplicationContext(), android.R.layout.simple_spinner_item,
+				profiles);
+		adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+		combo.setAdapter(adapter);
+		if (selectLastProfile) {
+			selectLastProfile = false;
+			combo.setSelection(profiles.size() - 1);
+		}
+	}
 }
\ No newline at end of file