diff --git a/BUGS b/BUGS
index 3b30e9cc..952bf5ed 100644
--- a/BUGS
+++ b/BUGS
@@ -38,3 +38,4 @@
   implicitly when the "Magic Line" returns, but it is noted here for
   documentation's sake. (24) [FIXED]
 - totsize becomes incorrect after word-wrapping (25)
+- In search/replace code there is too much refreshing in bottomwin (26)
diff --git a/ChangeLog b/ChangeLog
index c24b87e9..05690f40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@ Current CVS:
 - nano.c:
   main():
 	- TABSIZE now set before first call to edit_refresh (Bill Soudan)
+- search.c:
+  search_init():
+	- Added " (to replace)" statement to end of search string if 
+	  we are doing a replace.  Manually converted all the translations
+	  from '%s' to '%s%s' to ensure they still work with the new code.
+	  Also put in the translation for " (replace)" in the .po's.  Hope
+	  I didn't step on your toes doing this Jordi. (Chris)
 
 nano-0.9.12 - 07/07/2000
 - all:
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index b560aadb..66409ce8 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -178,38 +178,39 @@ Usage: nano [option] +LINE <file>\n\
   {"Main: open file\n", 147},
   {"I got Alt-[-%c! (%d)\n", 148},
   {"I got Alt-%c! (%d)\n", 149},
-  {"Case Sensitive Regexp Search%s", 150},
-  {"Regexp Search%s", 151},
-  {"Case Sensitive Search%s", 152},
-  {"Search%s", 153},
-  {"Search Cancelled", 154},
-  {"Search Wrapped", 155},
-  {"Replaced %d occurences", 156},
-  {"Replaced 1 occurence", 157},
-  {"Replace Cancelled", 158},
-  {"Replace with [%s]", 159},
-  {"Replace with", 160},
-  {"Replace this instance?", 161},
-  {"Enter line number", 162},
-  {"Aborted", 163},
-  {"Come on, be reasonable", 164},
-  {"Only %d lines available, skipping to last line", 165},
-  {"actual_x_from_start for xplus=%d returned %d\n", 166},
-  {"input '%c' (%d)\n", 167},
-  {"New Buffer", 168},
-  {"  File: ...", 169},
-  {"Modified", 170},
-  {"Moved to (%d, %d) in edit buffer\n", 171},
-  {"current->data = \"%s\"\n", 172},
-  {"I got \"%s\"\n", 173},
-  {"Yes", 174},
-  {"All", 175},
-  {"No", 176},
-  {"do_cursorpos: linepct = %f, bytepct = %f\n", 177},
-  {"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 178},
-  {"Dumping file buffer to stderr...\n", 179},
-  {"Dumping cutbuffer to stderr...\n", 180},
-  {"Dumping a buffer to stderr...\n", 181},
+  {"Case Sensitive Regexp Search%s%s", 150},
+  {"Regexp Search%s%s", 151},
+  {"Case Sensitive Search%s%s", 152},
+  {"Search%s%s", 153},
+  {" (to replace)", 154},
+  {"Search Cancelled", 155},
+  {"Search Wrapped", 156},
+  {"Replaced %d occurences", 157},
+  {"Replaced 1 occurence", 158},
+  {"Replace Cancelled", 159},
+  {"Replace with [%s]", 160},
+  {"Replace with", 161},
+  {"Replace this instance?", 162},
+  {"Enter line number", 163},
+  {"Aborted", 164},
+  {"Come on, be reasonable", 165},
+  {"Only %d lines available, skipping to last line", 166},
+  {"actual_x_from_start for xplus=%d returned %d\n", 167},
+  {"input '%c' (%d)\n", 168},
+  {"New Buffer", 169},
+  {"  File: ...", 170},
+  {"Modified", 171},
+  {"Moved to (%d, %d) in edit buffer\n", 172},
+  {"current->data = \"%s\"\n", 173},
+  {"I got \"%s\"\n", 174},
+  {"Yes", 175},
+  {"All", 176},
+  {"No", 177},
+  {"do_cursorpos: linepct = %f, bytepct = %f\n", 178},
+  {"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 179},
+  {"Dumping file buffer to stderr...\n", 180},
+  {"Dumping cutbuffer to stderr...\n", 181},
+  {"Dumping a buffer to stderr...\n", 182},
 };
 
-int _msg_tbl_length = 181;
+int _msg_tbl_length = 182;
diff --git a/po/de.gmo b/po/de.gmo
index 77adeb72..ced903f6 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 5e87fae9..fb15fe46 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 0.9.11\n"
-"POT-Creation-Date: 2000-07-07 21:26-0400\n"
+"POT-Creation-Date: 2000-07-08 19:47-0400\n"
 "PO-Revision-Date: 2000-06-21 12:19+0200\n"
 "Last-Translator: Florian König <floki@bigfoot.com>\n"
 "Language-Team: German <floki@bigfoot.com>\n"
@@ -32,7 +32,7 @@ msgstr "read_line: nicht in der ersten Zeile und prev ist NULL"
 msgid "Read %d lines"
 msgstr "%d Zeilen gelesen"
 
-#: files.c:215 search.c:163 search.c:181
+#: files.c:215 search.c:166 search.c:184
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" nicht gefunden"
@@ -682,73 +682,78 @@ msgstr "Erhielt Alt-%c! (%d)\n"
 
 #: search.c:71
 #, fuzzy, c-format
-msgid "Case Sensitive Regexp Search%s"
-msgstr "Suche mit Unterscheidung von Groß- und Kleinschreibung%s"
+msgid "Case Sensitive Regexp Search%s%s"
+msgstr "Suche mit Unterscheidung von Groß- und Kleinschreibung%s%s"
 
 #: search.c:73
 #, fuzzy, c-format
-msgid "Regexp Search%s"
-msgstr "Suche%s"
+msgid "Regexp Search%s%s"
+msgstr "Suche%s%s"
 
 #: search.c:76
-#, c-format
-msgid "Case Sensitive Search%s"
-msgstr "Suche mit Unterscheidung von Groß- und Kleinschreibung%s"
+#, fuzzy, c-format
+msgid "Case Sensitive Search%s%s"
+msgstr "Suche mit Unterscheidung von Groß- und Kleinschreibung%s%s"
 
 #: search.c:78
-#, c-format
-msgid "Search%s"
-msgstr "Suche%s"
+#, fuzzy, c-format
+msgid "Search%s%s"
+msgstr "Suche%s%s"
 
-#: search.c:86
+#: search.c:81
+#, fuzzy
+msgid " (to replace)"
+msgstr " (ersetzen)"
+
+#: search.c:89
 msgid "Search Cancelled"
 msgstr "Suche abgebrochen"
 
-#: search.c:177
+#: search.c:180
 msgid "Search Wrapped"
 msgstr "Suche in neue Zeile umgebrochen"
 
-#: search.c:232
+#: search.c:235
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "%d mal Ersetzung vorgenommen"
 
-#: search.c:234
+#: search.c:237
 msgid "Replaced 1 occurence"
 msgstr "1 Ersetzung vorgenommen"
 
-#: search.c:373 search.c:395 search.c:418
+#: search.c:376 search.c:398 search.c:421
 msgid "Replace Cancelled"
 msgstr "Ersetzung abgebrochen"
 
-#: search.c:391
+#: search.c:394
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Ersetzen mit [%s]"
 
 #. last_search is empty
-#: search.c:416
+#: search.c:419
 msgid "Replace with"
 msgstr "Ersetzen mit"
 
-#: search.c:457
+#: search.c:460
 msgid "Replace this instance?"
 msgstr "Ersetzen?"
 
 #. Ask for it
-#: search.c:508
+#: search.c:511
 msgid "Enter line number"
 msgstr "Zeilennummer eingeben"
 
-#: search.c:510
+#: search.c:513
 msgid "Aborted"
 msgstr "Abgebrochen"
 
-#: search.c:530
+#: search.c:533
 msgid "Come on, be reasonable"
 msgstr "Komm schon, sei vernünftig"
 
-#: search.c:535
+#: search.c:538
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Nur %d Zeilen vorhanden, springe zur letzten Zeile"
@@ -823,10 +828,6 @@ msgstr "Gebe Inhalt der Zwischenablage nach stderr aus...\n"
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Gebe einen Puffer nach stderr aus...\n"
 
-#, fuzzy
-#~ msgid "To Replace"
-#~ msgstr "Ersetzen"
-
 #, fuzzy
 #~ msgid "To Search"
 #~ msgstr "Suche"
diff --git a/po/es.gmo b/po/es.gmo
index 898aa764..68cc7597 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 93964809..b6c196fe 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.11\n"
-"POT-Creation-Date: 2000-07-07 21:26-0400\n"
+"POT-Creation-Date: 2000-07-08 19:47-0400\n"
 "PO-Revision-Date: 2000-06-20 02:56+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Spanish <jordi@sindominio.net>\n"
@@ -32,7 +32,7 @@ msgstr "read_line: no estamos en la primera l
 msgid "Read %d lines"
 msgstr "%d líneas leídas"
 
-#: files.c:215 search.c:163 search.c:181
+#: files.c:215 search.c:166 search.c:184
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" no encontrado"
@@ -676,73 +676,78 @@ msgstr "Pill
 
 #: search.c:71
 #, fuzzy, c-format
-msgid "Case Sensitive Regexp Search%s"
-msgstr "Búsqueda con Mayúsculas/Minúsculas%s"
+msgid "Case Sensitive Regexp Search%s%s"
+msgstr "Búsqueda con Mayúsculas/Minúsculas%s%s"
 
 #: search.c:73
 #, fuzzy, c-format
-msgid "Regexp Search%s"
-msgstr "Buscar%s"
+msgid "Regexp Search%s%s"
+msgstr "Buscar%s%s"
 
 #: search.c:76
-#, c-format
-msgid "Case Sensitive Search%s"
-msgstr "Búsqueda con Mayúsculas/Minúsculas%s"
+#, fuzzy, c-format
+msgid "Case Sensitive Search%s%s"
+msgstr "Búsqueda con Mayúsculas/Minúsculas%s%s"
 
 #: search.c:78
-#, c-format
-msgid "Search%s"
-msgstr "Buscar%s"
+#, fuzzy, c-format
+msgid "Search%s%s"
+msgstr "Buscar%s%s"
 
-#: search.c:86
+#: search.c:81
+#, fuzzy
+msgid " (to replace)"
+msgstr " (reemplazar)"
+
+#: search.c:89
 msgid "Search Cancelled"
 msgstr "Búsqueda Cancelada"
 
-#: search.c:177
+#: search.c:180
 msgid "Search Wrapped"
 msgstr "Búsqueda Recomenzada"
 
-#: search.c:232
+#: search.c:235
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "%d ocurrencias reemplazadas"
 
-#: search.c:234
+#: search.c:237
 msgid "Replaced 1 occurence"
 msgstr "1 ocurrencia reemplazada"
 
-#: search.c:373 search.c:395 search.c:418
+#: search.c:376 search.c:398 search.c:421
 msgid "Replace Cancelled"
 msgstr "Reemplazar Cancelado"
 
-#: search.c:391
+#: search.c:394
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Reemplazar con [%s]"
 
 #. last_search is empty
-#: search.c:416
+#: search.c:419
 msgid "Replace with"
 msgstr "Reemplazar con"
 
-#: search.c:457
+#: search.c:460
 msgid "Replace this instance?"
 msgstr "Reemplazar esta instancia?"
 
 #. Ask for it
-#: search.c:508
+#: search.c:511
 msgid "Enter line number"
 msgstr "Introduce número de línea"
 
-#: search.c:510
+#: search.c:513
 msgid "Aborted"
 msgstr "Abortado"
 
-#: search.c:530
+#: search.c:533
 msgid "Come on, be reasonable"
 msgstr "Venga ya, se razonable"
 
-#: search.c:535
+#: search.c:538
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Sólo hay %d líneas, saltando hasta la última"
@@ -817,9 +822,6 @@ msgstr "Volcando el cutbuffer a stderr...\n"
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Volcando un buffer a stderr...\n"
 
-#~ msgid "To Replace"
-#~ msgstr "Reemplazar"
-
 #~ msgid "To Search"
 #~ msgstr "Buscar"
 
diff --git a/po/fi.gmo b/po/fi.gmo
index edcfc0a0..3cdf6760 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index 94e284e1..35d8ac4e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 0.9.11\n"
-"POT-Creation-Date: 2000-07-07 21:26-0400\n"
+"POT-Creation-Date: 2000-07-08 19:47-0400\n"
 "PO-Revision-Date: 2000-06-21 23:08+03:00\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -31,7 +31,7 @@ msgstr "read_line: ei ensimm
 msgid "Read %d lines"
 msgstr "%d riviä luettu"
 
-#: files.c:215 search.c:163 search.c:181
+#: files.c:215 search.c:166 search.c:184
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Tiedostoa \"%s\" ei ole"
@@ -675,73 +675,78 @@ msgstr "Vastaanotettu Alt-%c! (%d)\n"
 
 #: search.c:71
 #, fuzzy, c-format
-msgid "Case Sensitive Regexp Search%s"
-msgstr "Kirjainkoosta välittävä etsintä%s"
+msgid "Case Sensitive Regexp Search%s%s"
+msgstr "Kirjainkoosta välittävä etsintä%s%s"
 
 #: search.c:73
 #, fuzzy, c-format
-msgid "Regexp Search%s"
-msgstr "Etsintä%s"
+msgid "Regexp Search%s%s"
+msgstr "Etsintä%s%s"
 
 #: search.c:76
-#, c-format
-msgid "Case Sensitive Search%s"
-msgstr "Kirjainkoosta välittävä etsintä%s"
+#, fuzzy, c-format
+msgid "Case Sensitive Search%s%s"
+msgstr "Kirjainkoosta välittävä etsintä%s%s"
 
 #: search.c:78
-#, c-format
-msgid "Search%s"
-msgstr "Etsintä%s"
+#, fuzzy, c-format
+msgid "Search%s%s"
+msgstr "Etsintä%s%s"
 
-#: search.c:86
+#: search.c:81
+#, fuzzy
+msgid " (to replace)"
+msgstr " (korvaa)"
+
+#: search.c:89
 msgid "Search Cancelled"
 msgstr "Etsintä peruttu"
 
-#: search.c:177
+#: search.c:180
 msgid "Search Wrapped"
 msgstr "Etsintä jatkuu"
 
-#: search.c:232
+#: search.c:235
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "%d kohtaa korvattu"
 
-#: search.c:234
+#: search.c:237
 msgid "Replaced 1 occurence"
 msgstr "1 kohta korvattu"
 
-#: search.c:373 search.c:395 search.c:418
+#: search.c:376 search.c:398 search.c:421
 msgid "Replace Cancelled"
 msgstr "Korvaus peruttu"
 
-#: search.c:391
+#: search.c:394
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Korvaa merkkijonolla [%s]"
 
 #. last_search is empty
-#: search.c:416
+#: search.c:419
 msgid "Replace with"
 msgstr "Korvaa merkkijonolla"
 
-#: search.c:457
+#: search.c:460
 msgid "Replace this instance?"
 msgstr "Korvataanko tämä kohta?"
 
 #. Ask for it
-#: search.c:508
+#: search.c:511
 msgid "Enter line number"
 msgstr "Kirjoita rivin numero"
 
-#: search.c:510
+#: search.c:513
 msgid "Aborted"
 msgstr "Keskeytetty"
 
-#: search.c:530
+#: search.c:533
 msgid "Come on, be reasonable"
 msgstr "Jotakin järkevää, kiitos?"
 
-#: search.c:535
+#: search.c:538
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Vain %d riviä olemassa, siirrytään viimeiselle riville"
@@ -816,9 +821,6 @@ msgstr "Sy
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Syötetään teksti stderriin...\n"
 
-#~ msgid "To Replace"
-#~ msgstr "Korvattava"
-
 #~ msgid "To Search"
 #~ msgstr "Etsittävä"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index 2ad7beda..a868e81d 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index dbfc5dc6..26bc9ab8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.8.9\n"
-"POT-Creation-Date: 2000-07-07 21:26-0400\n"
+"POT-Creation-Date: 2000-07-08 19:47-0400\n"
 "PO-Revision-Date: 2000-03-24 01:32+0100\n"
 "Last-Translator: Pierre Tane <tanep@bigfoot.com>\n"
 "Language-Team: French <LL@li.org>\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Read %d lines"
 msgstr "%d lignes lues"
 
-#: files.c:215 search.c:163 search.c:181
+#: files.c:215 search.c:166 search.c:184
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trouvé"
@@ -674,73 +674,78 @@ msgstr "J'ai re
 
 #: search.c:71
 #, fuzzy, c-format
-msgid "Case Sensitive Regexp Search%s"
-msgstr "Recherche sensible ) la casse%s"
+msgid "Case Sensitive Regexp Search%s%s"
+msgstr "Recherche sensible ) la casse%s%s"
 
 #: search.c:73
-#, c-format
-msgid "Regexp Search%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Regexp Search%s%s"
+msgstr "Recherche sensible ) la casse%s%s"
 
 #: search.c:76
-#, c-format
-msgid "Case Sensitive Search%s"
-msgstr "Recherche sensible ) la casse%s"
+#, fuzzy, c-format
+msgid "Case Sensitive Search%s%s"
+msgstr "Recherche sensible ) la casse%s%s"
 
 #: search.c:78
 #, c-format
-msgid "Search%s"
+msgid "Search%s%s"
 msgstr ""
 
-#: search.c:86
+#: search.c:81
+#, fuzzy
+msgid " (to replace)"
+msgstr " (rempacer par)"
+
+#: search.c:89
 msgid "Search Cancelled"
 msgstr "Recherche annulée"
 
-#: search.c:177
+#: search.c:180
 msgid "Search Wrapped"
 msgstr "La recherche a bouclé"
 
-#: search.c:232
+#: search.c:235
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "%d occurences remplacées"
 
-#: search.c:234
+#: search.c:237
 msgid "Replaced 1 occurence"
 msgstr "1 occurence remplacée"
 
-#: search.c:373 search.c:395 search.c:418
+#: search.c:376 search.c:398 search.c:421
 msgid "Replace Cancelled"
 msgstr "Remplacement annulé"
 
-#: search.c:391
+#: search.c:394
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Remplacer par [%s]"
 
 #. last_search is empty
-#: search.c:416
+#: search.c:419
 msgid "Replace with"
 msgstr "Rempacer par"
 
-#: search.c:457
+#: search.c:460
 msgid "Replace this instance?"
 msgstr "Remplacer cette occurence?"
 
 #. Ask for it
-#: search.c:508
+#: search.c:511
 msgid "Enter line number"
 msgstr "Entrer le numéro de ligne"
 
-#: search.c:510
+#: search.c:513
 msgid "Aborted"
 msgstr "Annulé"
 
-#: search.c:530
+#: search.c:533
 msgid "Come on, be reasonable"
 msgstr "Allez, soyez raisonnable"
 
-#: search.c:535
+#: search.c:538
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Seulement %d lignes sont disponibles, saut jusqu'à la dernière ligne"
@@ -815,10 +820,6 @@ msgstr "Envoi du cutbuffer sur stderr...\n"
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Envoi d'un buffer sur stderr...\n"
 
-#, fuzzy
-#~ msgid "To Replace"
-#~ msgstr "Rempacer par"
-
 #~ msgid " Y"
 #~ msgstr " O"
 
diff --git a/po/id.gmo b/po/id.gmo
index a2c2031a..44297533 100644
Binary files a/po/id.gmo and b/po/id.gmo differ
diff --git a/po/id.po b/po/id.po
index 4dddb9fa..13cdcd78 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nano-0.9.10\n"
-"POT-Creation-Date: 2000-07-07 21:26-0400\n"
+"POT-Creation-Date: 2000-07-08 19:47-0400\n"
 "PO-Revision-Date: 2000-06-08 20:56+07:00\n"
 "Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -31,7 +31,7 @@ msgstr "read_line: tidak di baris pertama dan sebelumnya adalah NULL"
 msgid "Read %d lines"
 msgstr "Membaca %d baris"
 
-#: files.c:215 search.c:163 search.c:181
+#: files.c:215 search.c:166 search.c:184
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" tidak ditemukan"
@@ -674,73 +674,78 @@ msgstr "Saya mendapat Alt-%c! (%d)\n"
 
 #: search.c:71
 #, fuzzy, c-format
-msgid "Case Sensitive Regexp Search%s"
-msgstr "Pencarian case sensitif%s"
+msgid "Case Sensitive Regexp Search%s%s"
+msgstr "Pencarian case sensitif%s%s"
 
 #: search.c:73
 #, fuzzy, c-format
-msgid "Regexp Search%s"
-msgstr "Pencarian%s"
+msgid "Regexp Search%s%s"
+msgstr "Pencarian%s%s"
 
 #: search.c:76
-#, c-format
-msgid "Case Sensitive Search%s"
-msgstr "Pencarian case sensitif%s"
+#, fuzzy, c-format
+msgid "Case Sensitive Search%s%s"
+msgstr "Pencarian case sensitif%s%s"
 
 #: search.c:78
-#, c-format
-msgid "Search%s"
-msgstr "Pencarian%s"
+#, fuzzy, c-format
+msgid "Search%s%s"
+msgstr "Pencarian%s%s"
 
-#: search.c:86
+#: search.c:81
+#, fuzzy
+msgid " (to replace)"
+msgstr " (ganti)"
+
+#: search.c:89
 msgid "Search Cancelled"
 msgstr "Batalkan pencarian"
 
-#: search.c:177
+#: search.c:180
 msgid "Search Wrapped"
 msgstr "Pancarian diulangi dari awal"
 
-#: search.c:232
+#: search.c:235
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "%d tempat terganti"
 
-#: search.c:234
+#: search.c:237
 msgid "Replaced 1 occurence"
 msgstr "Terganti 1 tempat"
 
-#: search.c:373 search.c:395 search.c:418
+#: search.c:376 search.c:398 search.c:421
 msgid "Replace Cancelled"
 msgstr "Batalkan penggantian"
 
-#: search.c:391
+#: search.c:394
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Ganti dengan [%s]"
 
 #. last_search is empty
-#: search.c:416
+#: search.c:419
 msgid "Replace with"
 msgstr "Ganti dengan"
 
-#: search.c:457
+#: search.c:460
 msgid "Replace this instance?"
 msgstr "Ganti kata ini?"
 
 #. Ask for it
-#: search.c:508
+#: search.c:511
 msgid "Enter line number"
 msgstr "Masukkan nomor baris"
 
-#: search.c:510
+#: search.c:513
 msgid "Aborted"
 msgstr "Dibatalkan"
 
-#: search.c:530
+#: search.c:533
 msgid "Come on, be reasonable"
 msgstr "Ayo, yang masuk akal"
 
-#: search.c:535
+#: search.c:538
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Hanya %d baris tersedia, melompat ke baris akhir"
@@ -815,9 +820,6 @@ msgstr "Kirim cutbuffer ke stderr...\n"
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Kirim buffer ke stderr...\n"
 
-#~ msgid "To Replace"
-#~ msgstr "Mengganti"
-
 #~ msgid "To Search"
 #~ msgstr "Mencari"
 
diff --git a/po/it.gmo b/po/it.gmo
index 34ce4ab5..cae3f33d 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index abb90707..ca5de445 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.8.7\n"
-"POT-Creation-Date: 2000-07-07 21:26-0400\n"
+"POT-Creation-Date: 2000-07-08 19:47-0400\n"
 "PO-Revision-Date: 2000-03-03 04:57+0100\n"
 "Last-Translator: Daniele Medri <madrid@linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr "read_line: no estamos en la primera l
 msgid "Read %d lines"
 msgstr "Leggi %d linee"
 
-#: files.c:215 search.c:163 search.c:181
+#: files.c:215 search.c:166 search.c:184
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trovato"
@@ -661,73 +661,78 @@ msgstr "Premuto Alt-%c! (%d)\n"
 
 #: search.c:71
 #, fuzzy, c-format
-msgid "Case Sensitive Regexp Search%s"
-msgstr "Ricerca case sensitive %s"
+msgid "Case Sensitive Regexp Search%s%s"
+msgstr "Ricerca case sensitive%s%s"
 
 #: search.c:73
 #, fuzzy, c-format
-msgid "Regexp Search%s"
-msgstr "Ricerca%s"
+msgid "Regexp Search%s%s"
+msgstr "Ricerca%s%s"
 
 #: search.c:76
-#, c-format
-msgid "Case Sensitive Search%s"
-msgstr "Ricerca case sensitive %s"
+#, fuzzy, c-format
+msgid "Case Sensitive Search%s%s"
+msgstr "Ricerca case sensitive%s%s"
 
 #: search.c:78
-#, c-format
-msgid "Search%s"
-msgstr "Ricerca%s"
+#, fuzzy, c-format
+msgid "Search%s%s"
+msgstr "Ricerca%s%s"
 
-#: search.c:86
+#: search.c:81
+#, fuzzy
+msgid " (to replace)"
+msgstr " (sostituisci)"
+
+#: search.c:89
 msgid "Search Cancelled"
 msgstr "Ricerca annullata"
 
-#: search.c:177
+#: search.c:180
 msgid "Search Wrapped"
 msgstr "Ricerca interrotta"
 
-#: search.c:232
+#: search.c:235
 #, c-format
 msgid "Replaced %d occurences"
 msgstr "Sostituite %d occorrenze"
 
-#: search.c:234
+#: search.c:237
 msgid "Replaced 1 occurence"
 msgstr "Sostituita 1 occorrenza"
 
-#: search.c:373 search.c:395 search.c:418
+#: search.c:376 search.c:398 search.c:421
 msgid "Replace Cancelled"
 msgstr "Sostituzione annullata"
 
-#: search.c:391
+#: search.c:394
 #, c-format
 msgid "Replace with [%s]"
 msgstr "Sostituisci con [%s]"
 
 #. last_search is empty
-#: search.c:416
+#: search.c:419
 msgid "Replace with"
 msgstr "Sostituisci con"
 
-#: search.c:457
+#: search.c:460
 msgid "Replace this instance?"
 msgstr "Sostituisci questa istanza?"
 
 #. Ask for it
-#: search.c:508
+#: search.c:511
 msgid "Enter line number"
 msgstr "Inserire numero linea"
 
-#: search.c:510
+#: search.c:513
 msgid "Aborted"
 msgstr "Operazione fallita"
 
-#: search.c:530
+#: search.c:533
 msgid "Come on, be reasonable"
 msgstr "Avanti, sii ragionevole"
 
-#: search.c:535
+#: search.c:538
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr "Solo %d linee disponibili, vai all'ultima"
@@ -802,10 +807,6 @@ msgstr "Copia cutbuffer sullo stderr...\n"
 msgid "Dumping a buffer to stderr...\n"
 msgstr "Copia un buffer sullo stderr...\n"
 
-#, fuzzy
-#~ msgid "To Replace"
-#~ msgstr "Sostituisci"
-
 #, fuzzy
 #~ msgid "To Search"
 #~ msgstr "Ricerca%s"
diff --git a/po/nano.pot b/po/nano.pot
index f43df8f5..5d307a0f 100644
--- a/po/nano.pot
+++ b/po/nano.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-07 21:26-0400\n"
+"POT-Creation-Date: 2000-07-08 19:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,7 +32,7 @@ msgstr ""
 msgid "Read %d lines"
 msgstr ""
 
-#: files.c:215 search.c:163 search.c:181
+#: files.c:215 search.c:166 search.c:184
 #, c-format
 msgid "\"%s\" not found"
 msgstr ""
@@ -653,73 +653,77 @@ msgstr ""
 
 #: search.c:71
 #, c-format
-msgid "Case Sensitive Regexp Search%s"
+msgid "Case Sensitive Regexp Search%s%s"
 msgstr ""
 
 #: search.c:73
 #, c-format
-msgid "Regexp Search%s"
+msgid "Regexp Search%s%s"
 msgstr ""
 
 #: search.c:76
 #, c-format
-msgid "Case Sensitive Search%s"
+msgid "Case Sensitive Search%s%s"
 msgstr ""
 
 #: search.c:78
 #, c-format
-msgid "Search%s"
+msgid "Search%s%s"
 msgstr ""
 
-#: search.c:86
+#: search.c:81
+msgid " (to replace)"
+msgstr ""
+
+#: search.c:89
 msgid "Search Cancelled"
 msgstr ""
 
-#: search.c:177
+#: search.c:180
 msgid "Search Wrapped"
 msgstr ""
 
-#: search.c:232
+#: search.c:235
 #, c-format
 msgid "Replaced %d occurences"
 msgstr ""
 
-#: search.c:234
+#: search.c:237
 msgid "Replaced 1 occurence"
 msgstr ""
 
-#: search.c:373 search.c:395 search.c:418
+#: search.c:376 search.c:398 search.c:421
 msgid "Replace Cancelled"
 msgstr ""
 
-#: search.c:391
+#: search.c:394
 #, c-format
 msgid "Replace with [%s]"
 msgstr ""
 
 #. last_search is empty
-#: search.c:416
+#: search.c:419
 msgid "Replace with"
 msgstr ""
 
-#: search.c:457
+#: search.c:460
 msgid "Replace this instance?"
 msgstr ""
 
 #. Ask for it
-#: search.c:508
+#: search.c:511
 msgid "Enter line number"
 msgstr ""
 
-#: search.c:510
+#: search.c:513
 msgid "Aborted"
 msgstr ""
 
-#: search.c:530
+#: search.c:533
 msgid "Come on, be reasonable"
 msgstr ""
 
-#: search.c:535
+#: search.c:538
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr ""
diff --git a/search.c b/search.c
index fffb43ec..d9dab883 100644
--- a/search.c
+++ b/search.c
@@ -59,7 +59,7 @@ int search_init(int replacing)
 {
     int i;
     char buf[BUFSIZ];
-    char *prompt;
+    char *prompt, *reprompt = "";
  
     if (last_search[0]) {
 	snprintf(buf, BUFSIZ, " [%s]", last_search);
@@ -68,18 +68,21 @@ int search_init(int replacing)
     }
 
     if (ISSET(USE_REGEXP) && ISSET(CASE_SENSITIVE))
-        prompt = _("Case Sensitive Regexp Search%s");
+        prompt = _("Case Sensitive Regexp Search%s%s");
     else if (ISSET(USE_REGEXP))
-        prompt = _("Regexp Search%s");
+        prompt = _("Regexp Search%s%s");
     else 
     if (ISSET(CASE_SENSITIVE))
-        prompt = _("Case Sensitive Search%s");
+        prompt = _("Case Sensitive Search%s%s");
     else
-        prompt = _("Search%s");            
-        
+        prompt = _("Search%s%s");
+
+    if (replacing)
+	reprompt = _(" (to replace)");
+	        
     i = statusq(replacing ? replace_list : whereis_list,
 		replacing ? REPLACE_LIST_LEN : WHEREIS_LIST_LEN, "",
-		prompt, buf);
+		prompt, reprompt, buf);
 
     /* Cancel any search, or just return with no previous search */
     if ((i == -1) || (i < 0 && !last_search[0])) {
diff --git a/winio.c b/winio.c
index e9d5f952..a53c0b94 100644
--- a/winio.c
+++ b/winio.c
@@ -942,8 +942,8 @@ int statusq(shortcut s[], int slen, char *def, char *msg, ...)
 
     va_start(ap, msg);
     vsnprintf(foo, 132, msg, ap);
-    strncat(foo, ": ", 132);
     va_end(ap);
+    strncat(foo, ": ", 132);
 
     wattron(bottomwin, A_REVERSE);
     ret = nanogetstr(foo, def, s, slen, (strlen(foo) + 3));