diff --git a/actions/noticesearch.php b/actions/noticesearch.php
new file mode 100644
index 0000000000..7f645dbc23
--- /dev/null
+++ b/actions/noticesearch.php
@@ -0,0 +1,175 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+define(NOTICES_PER_PAGE, 20);
+
+# XXX common parent for people and content search?
+
+class NoticesearchAction extends Action {
+	
+	function handle($args) {
+		parent::handle($args);
+		$this->show_form();
+	}
+
+	function get_instructions() {
+		return _t('Search for notices on %%site.name%% by their contents. ' . 
+				  'Separate search terms by spaces; they must be 3 characters or more.');
+	}
+	
+	function show_top($error=NULL) {
+		if ($error) {
+			common_element('p', 'error', $error);
+		} else {
+			$instr = $this->get_instructions();
+			$output = common_markup_to_html($instr);
+			common_element_start('div', 'instructions');
+			common_raw($output);
+			common_element_end('div');
+		}
+	}
+	
+	function show_form($error=NULL) {
+		$q = $this->trimmed('q');
+		$page = $this->trimmed('page', 1);
+		
+		common_show_header(_t('Find notices'), NULL, $error, array($this, 'show_top'));
+		common_element_start('form', array('method' => 'post',
+										   'id' => 'login',
+										   'action' => common_local_url('noticesearch')));
+		common_element_start('p');
+		common_element('input', array('name' => 'q',
+									  'id' => 'q',
+									  'type' => 'text',
+									  'class' => 'input_text',
+									  'value' => ($q) ? $q : ''));
+		common_text(' ');
+		common_element('input', array('type' => 'submit',
+									  'id' => 'search',
+									  'name' => 'search',
+									  'class' => 'submit',
+									  'value' => _t('Search')));
+					   
+		common_element_end('p');
+		common_element_end('form');
+		if ($q) {
+			$this->show_results($q, $page);
+		}
+		common_show_footer();
+	}
+	
+	function show_results($q, $page) {
+		
+		$notice = new Notice();
+
+		# lcase it for comparison
+		$q = strtolower($q);
+		$notice->whereAdd('MATCH(content) against (\''.addslashes($q).'\')');
+
+		# Ask for an extra to see if there's more.
+		
+		$notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
+
+		$cnt = $notice->find();
+
+		if ($cnt > 0) {
+			$terms = preg_split('/[\s,]+/', $q);
+			common_element_start('ul', array('id' => 'notice'));
+			for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
+				if ($notice->fetch()) {
+					$this->show_notice($notice, $terms);
+				} else {
+					// shouldn't happen!
+					break;
+				}
+			}
+			common_element_end('ul');
+		} else {
+			common_element('p', 'error', _t('No results'));
+		}
+		
+		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
+						  $page, 'noticesearch', array('q' => $q));
+	}
+
+	# XXX: refactor and combine with StreamAction::show_notice()
+	
+	function show_notice($notice, $terms) {
+		$profile = $notice->getProfile();
+		# XXX: RDFa
+		common_element_start('li', array('class' => 'notice_single',
+										  'id' => 'notice-' . $notice->id));
+		$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
+		common_element_start('a', array('href' => $profile->profileurl));
+		common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
+									'class' => 'avatar stream',
+									'width' => AVATAR_STREAM_SIZE,
+									'height' => AVATAR_STREAM_SIZE,
+									'alt' =>
+									($profile->fullname) ? $profile->fullname :
+									$profile->nickname));
+		common_element_end('a');
+		common_element('a', array('href' => $profile->profileurl,
+								  'class' => 'nickname'),
+					   $profile->nickname);
+		# FIXME: URL, image, video, audio
+		common_element_start('p', array('class' => 'content'));
+		if ($notice->rendered) {
+			common_raw($this->highlight($notice->rendered));
+		} else {
+			# XXX: may be some uncooked notices in the DB,
+			# we cook them right now. This should probably disappear in future
+			# versions (>> 0.4.x)
+			common_raw($this->highlight(common_render_content($notice->content, $notice)));
+		}
+		common_element_end('p');
+		$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
+		common_element_start('p', 'time');
+		common_element('a', array('class' => 'permalink',
+								  'href' => $noticeurl,
+								  'title' => common_exact_date($notice->created)),
+					   common_date_string($notice->created));
+		if ($notice->reply_to) {
+			$replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
+			common_text(' (');
+			common_element('a', array('class' => 'inreplyto',
+									  'href' => $replyurl),
+						   _t('in reply to...'));
+			common_text(')');
+		}
+		common_element_start('a', 
+							 array('href' => common_local_url('newnotice',
+															  array('replyto' => $profile->nickname)),
+								   'onclick' => 'doreply("'.$profile->nickname.'"); return false',
+								   'title' => _t('reply'),
+								   'class' => 'replybutton'));
+		common_raw('&rarr;');
+		common_element_end('a');
+		common_element_end('p');
+		common_element_end('li');
+	}
+
+	function highlight($text, $terms) {
+		$pattern = '/('.implode('|',array_map('htmlspecialchars', $terms)).')/i';
+		$result = preg_replace($pattern, '<strong>\\1</strong>', $text);
+		return $result;
+	}
+}