diff -r 79e72b4741a2 -r 88fb084f3b1b pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Fri Nov 20 06:23:23 2009 +0000
+++ b/pidgin/gtkimhtml.c	Fri Nov 20 08:02:10 2009 +0000
@@ -4306,9 +4306,11 @@
 
 	if (imhtml->wbfo)
 		gtk_text_buffer_get_bounds(imhtml->text_buffer, &start, &end);
-	else
-		if (!gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end))
-			gtk_text_buffer_get_bounds(imhtml->text_buffer, &start, &end);
+	else if (!gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end)) {
+		GtkTextMark *mark = gtk_text_buffer_get_insert(imhtml->text_buffer);
+		gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &start, mark);
+		end = start;
+	}
 
 	gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "BOLD", &start, &end);
 	gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "ITALICS", &start, &end);