--- composer/e-msg-composer.c
+++ composer/e-msg-composer.c
@@ -5026,7 +5026,7 @@
 {
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	set_editor_text (composer, text, len, TRUE, text == "");
+	set_editor_text (composer, text, len, TRUE, strlen(text) == 0);
 }
 
 /**
--- shell/e-user-creatable-items-handler.c
+++ shell/e-user-creatable-items-handler.c
@@ -265,7 +265,7 @@
 				    && strcmp (corba_item->id, "message") == 0)
 					default_verb = item->verb;
 
-				if (corba_item->iconName == "") {
+				if (strlen(corba_item->iconName) == 0) {
 					item->icon = NULL;
 				} else {
 					item->icon = e_icon_factory_get_icon (corba_item->iconName, E_ICON_SIZE_MENU);