diff --git a/mail/ChangeLog b/mail/ChangeLog
index b5a7149073..be1a0d2e48 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-20  Peter Williams  <peterw@ximian.com>
+
+	* message-list.c (search_func): Once we hit the target node,
+	update the cursor_uid if it's set. Fixes #29085.
+
 2002-08-19  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-preferences.c (mail_preferences_apply): Fix a
diff --git a/mail/message-list.c b/mail/message-list.c
index 1ea817dd43..eb2115f763 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -434,6 +434,10 @@ search_func (ETreeModel *model, ETreePath path, struct search_func_data *data)
 	info = get_message_info (data->message_list, path);
 	
 	if (info && (info->flags & data->mask) == data->flags) {
+		if (data->message_list->cursor_uid) {
+			g_free (data->message_list->cursor_uid);
+			data->message_list->cursor_uid = g_strdup (camel_message_info_uid (info));
+		}
 		gtk_signal_emit (GTK_OBJECT (data->message_list), message_list_signals[MESSAGE_SELECTED],
 				 camel_message_info_uid (info));
 		return TRUE;