diff --git a/po/fr.po b/po/fr.po
index 65d8fc6..0205d93 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Phone 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 13:11+0100\n"
+"POT-Creation-Date: 2011-10-30 14:25+0100\n"
 "PO-Revision-Date: 2010-04-24 02:07+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: DeforaOS development (French) <devel-fr@lists.defora.org>\n"
diff --git a/src/modems/hayes.c b/src/modems/hayes.c
index 2b5d023..e89a645 100644
--- a/src/modems/hayes.c
+++ b/src/modems/hayes.c
@@ -1099,10 +1099,9 @@ static int _hayes_start(ModemPlugin * modem, unsigned int retry)
 	Hayes * hayes = modem->priv;
 	ModemEvent * event = &hayes->events[MODEM_EVENT_TYPE_STATUS];
 
+	/* considering us stopped */
+	event->status.status = MODEM_STATUS_STOPPED;
 	_hayes_reset_start(modem, retry);
-	/* report as being started */
-	event->status.status = MODEM_STATUS_STARTED;
-	modem->helper->event(modem->helper->modem, event);
 	return 0;
 }
 
@@ -1695,9 +1694,6 @@ static void _hayes_reset_stop(ModemPlugin * modem)
 	event = &hayes->events[MODEM_EVENT_TYPE_CONNECTION];
 	if(event->connection.connected)
 	{
-#if 1
-		fprintf(stderr, "DEBUG: %u\n", event->connection.connected);
-#endif
 		event->connection.connected = 0;
 		event->connection.in = 0;
 		event->connection.out = 0;
@@ -1948,6 +1944,11 @@ static gboolean _on_reset(gpointer data)
 					modem);
 		return FALSE;
 	}
+	if(event->status.status != MODEM_STATUS_STARTED)
+	{
+		event->status.status = MODEM_STATUS_STARTED;
+		modem->helper->event(modem->helper->modem, event);
+	}
 	hayes->channel = g_io_channel_unix_new(fd);
 	if((g_io_channel_set_encoding(hayes->channel, NULL, &error))
 			!= G_IO_STATUS_NORMAL)
@@ -3037,6 +3038,7 @@ static void _on_trigger_cmgr(ModemPlugin * modem, char const * answer)
 	event->message.folder = data->folder;
 	event->message.status = data->status;
 	event->message.number = number; /* XXX */
+	event->message.content = p;
 	modem->helper->event(modem->helper->modem, event);
 	free(p);
 }
@@ -3582,6 +3584,11 @@ static void _on_trigger_creg(ModemPlugin * modem, char const * answer)
 			break;
 		case 4: /* unknown */
 		default:
+#ifdef DEBUG
+			if(u[1] != 4)
+				fprintf(stderr, "DEBUG: %s() Unknown CREG %u\n",
+						__func__, u[1]);
+#endif
 			u[0] = MODEM_REGISTRATION_MODE_UNKNOWN;
 			u[1] = MODEM_REGISTRATION_STATUS_UNKNOWN;
 			break;