** Fixes part of bug #531591

2008-05-19  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes part of bug #531591

	* camel/camel-disco-diary.c:
	* camel/camel-disco-folder.c:
	* camel/camel-disco-store.c:
	* camel/camel-folder-summary.c:
	* camel/camel-folder.c:
	* camel/camel-gpg-context.c:
	* camel/camel-object.c:
	* camel/camel-offline-journal.c:
	* camel/camel-provider.c:
	* camel/camel-sasl-kerberos4.c:
	* camel/camel-service.c:
	* camel/camel-session.c:
	* camel/camel-smime-context.c:
	* camel/camel-store.c:
	* camel/camel-url.c:
	* camel/camel-vee-folder.c:
	* camel/providers/groupwise/camel-groupwise-folder.c
	* camel/providers/groupwise/camel-groupwise-store.c:
	* camel/providers/groupwise/camel-groupwise-utils.c:
	* camel/providers/imap/camel-imap-folder.c:
	* camel/providers/imap/camel-imap-store.c:
	* camel/providers/imap4/camel-imap4-engine.c:
	* camel/providers/imap4/camel-imap4-folder.c:
	* camel/providers/imap4/camel-imap4-store.c:
	* camel/providers/imap4/camel-imap4-summary.c:
	* camel/providers/local/camel-local-provider.c:
	* camel/providers/local/camel-local-store.c:
	* camel/providers/local/camel-maildir-store.c:
	* camel/providers/local/camel-mbox-store.c:
	* camel/providers/local/camel-mh-store.c:
	* camel/providers/local/camel-spool-store.c:
	* camel/providers/local/camel-spool-summary.c:
	* camel/providers/pop3/camel-pop3-store.c:
	Don't use TeX-style quotes in user-visible messages.


svn path=/trunk/; revision=8816

41 files changed, 201 insertions, 132 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index d37ef4c7d..58e7361d4 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,25 @@
+2008-05-19  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #531591
+
+	* camel-disco-diary.c:
+	* camel-disco-folder.c:
+	* camel-disco-store.c:
+	* camel-folder-summary.c:
+	* camel-folder.c:
+	* camel-gpg-context.c:
+	* camel-object.c:
+	* camel-offline-journal.c:
+	* camel-provider.c:
+	* camel-sasl-kerberos4.c:
+	* camel-service.c:
+	* camel-session.c:
+	* camel-smime-context.c:
+	* camel-store.c:
+	* camel-url.c:
+	* camel-vee-folder.c:
+	Don't use TeX-style quotes in user-visible messages.
+
 2008-05-13  Tor Lillqvist  <tml@novell.com>
 
 	* camel-net-utils.h [Win32]: Define WIN32_LEAN_AND_MEAN around
diff --git a/camel/camel-disco-diary.c b/camel/camel-disco-diary.c
index 8c2b11d09..8d8281e15 100644
--- a/camel/camel-disco-diary.c
+++ b/camel/camel-disco-diary.c
@@ -258,7 +258,7 @@ diary_decode_folder (CamelDiscoDiary *diary)
 		if (folder)
 			g_hash_table_insert (diary->folders, name, folder);
 		else {
-			msg = g_strdup_printf (_("Could not open `%s':\n%s\nChanges made to this folder will not be resynchronized."),
+			msg = g_strdup_printf (_("Could not open '%s':\n%s\nChanges made to this folder will not be resynchronized."),
 					       name, camel_exception_get_description (&ex));
 			camel_exception_clear (&ex);
 			camel_session_alert_user (camel_service_get_session (CAMEL_SERVICE (diary->store)),
diff --git a/camel/camel-disco-folder.c b/camel/camel-disco-folder.c
index 79331b4ac..7a6d7c65b 100644
--- a/camel/camel-disco-folder.c
+++ b/camel/camel-disco-folder.c
@@ -436,7 +436,7 @@ static void
 disco_cache_message (CamelDiscoFolder *disco_folder, const char *uid,
 		     CamelException *ex)
 {
-	g_warning ("CamelDiscoFolder::cache_message not implemented for `%s'",
+	g_warning ("CamelDiscoFolder::cache_message not implemented for '%s'",
 		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (disco_folder)));
 }
 
diff --git a/camel/camel-disco-store.c b/camel/camel-disco-store.c
index 2aba4a90b..55adba1f3 100644
--- a/camel/camel-disco-store.c
+++ b/camel/camel-disco-store.c
@@ -365,7 +365,7 @@ camel_disco_store_set_status (CamelDiscoStore *store,
 static gboolean
 can_work_offline (CamelDiscoStore *disco_store)
 {
-	g_warning ("CamelDiscoStore::can_work_offline not implemented for `%s'",
+	g_warning ("CamelDiscoStore::can_work_offline not implemented for '%s'",
 		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (disco_store)));
 	return FALSE;
 }
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 7e3b9d51e..c58ee12fb 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -604,7 +604,7 @@ camel_folder_summary_load(CamelFolderSummary *s)
 
 error:
 	if (errno != EINVAL)
-		g_warning ("Cannot load summary file: `%s': %s", s->summary_path, g_strerror (errno));
+		g_warning ("Cannot load summary file: '%s': %s", s->summary_path, g_strerror (errno));
 	
 	CAMEL_SUMMARY_UNLOCK(s, io_lock);
 	fclose (in);
@@ -1804,7 +1804,7 @@ message_info_new_from_header(CamelFolderSummary *s, struct _camel_header_raw *h)
 	irt = camel_header_references_inreplyto_decode (camel_header_raw_find (&h, "in-reply-to", NULL));
 	if (refs || irt) {
 		if (irt) {
-			/* The References field is populated from the ``References'' and/or ``In-Reply-To''
+			/* The References field is populated from the "References" and/or "In-Reply-To"
 			   headers. If both headers exist, take the first thing in the In-Reply-To header
 			   that looks like a Message-ID, and append it to the References header. */
 			
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 792ae3eb0..a01752b65 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -254,7 +254,7 @@ camel_folder_construct (CamelFolder *folder, CamelStore *parent_store,
 static void
 folder_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 {
-	w(g_warning ("CamelFolder::sync not implemented for `%s'",
+	w(g_warning ("CamelFolder::sync not implemented for '%s'",
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
 }
 
@@ -525,7 +525,7 @@ camel_folder_get_parent_store (CamelFolder *folder)
 static void
 expunge (CamelFolder *folder, CamelException *ex)
 {
-	w(g_warning ("CamelFolder::expunge not implemented for `%s'",
+	w(g_warning ("CamelFolder::expunge not implemented for '%s'",
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
 }
 
@@ -628,7 +628,7 @@ append_message (CamelFolder *folder, CamelMimeMessage *message,
 			      _("Unsupported operation: append message: for %s"),
 			      camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
 	
-	w(g_warning ("CamelFolder::append_message not implemented for `%s'",
+	w(g_warning ("CamelFolder::append_message not implemented for '%s'",
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
 	
 	return;
@@ -1054,7 +1054,7 @@ camel_folder_has_summary_capability (CamelFolder *folder)
 static CamelMimeMessage *
 get_message (CamelFolder *folder, const char *uid, CamelException *ex)
 {
-	w(g_warning ("CamelFolder::get_message not implemented for `%s'",
+	w(g_warning ("CamelFolder::get_message not implemented for '%s'",
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
 	
 	return NULL;
@@ -1251,7 +1251,7 @@ search_by_expression (CamelFolder *folder, const char *expression,
 			      camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
 	
 	w(g_warning ("CamelFolder::search_by_expression not implemented for "
-		     "`%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
+		     "'%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
 	
 	return NULL;
 }
@@ -1292,7 +1292,7 @@ search_by_uids(CamelFolder *folder, const char *exp, GPtrArray *uids, CamelExcep
 			      camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
 	
 	w(g_warning ("CamelFolder::search_by_expression not implemented for "
-		     "`%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
+		     "'%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
 	
 	return NULL;
 }
diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
index 7406e631c..3ff0f1a03 100644
--- a/camel/camel-gpg-context.c
+++ b/camel/camel-gpg-context.c
@@ -834,7 +834,7 @@ gpg_ctx_parse_status (struct _GpgCtx *gpg, CamelException *ex)
 		} else {
 			next_token ((char *) status, &prompt);
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Unexpected request from GnuPG for `%s'"), prompt);
+					      _("Unexpected request from GnuPG for '%s'"), prompt);
 			g_free (prompt);
 			return -1;
 		}
diff --git a/camel/camel-object.c b/camel/camel-object.c
index e1cecbbf0..83243df42 100644
--- a/camel/camel-object.c
+++ b/camel/camel-object.c
@@ -1158,13 +1158,13 @@ camel_object_class_add_event(CamelObjectClass *klass, const char *name, CamelObj
 
 	pair = co_find_pair(klass, name);
 	if (pair) {
-		g_warning("camel_object_class_add_event: `%s' is already declared for '%s'",
+		g_warning("camel_object_class_add_event: '%s' is already declared for '%s'",
 			  name, klass->name);
 		return;
 	}
 
 	if (klass->magic == CAMEL_INTERFACE_MAGIC && prep != NULL) {
-		g_warning("camel_object_class_add_event: `%s', CamelInterface '%s' may not have an event prep function - ignored",
+		g_warning("camel_object_class_add_event: '%s', CamelInterface '%s' may not have an event prep function - ignored",
 			  name, klass->name);
 		prep = NULL;
 	}
@@ -1306,7 +1306,7 @@ camel_object_hook_event(void *vo, const char * name, CamelObjectEventHookFunc fu
 			}
 		}
 
-		g_warning("camel_object_hook_event: trying to hook event `%s' in class `%s' with no defined events.",
+		g_warning("camel_object_hook_event: trying to hook event '%s' in class '%s' with no defined events.",
 			  name, obj->klass->name);
 
 		return 0;
@@ -1343,7 +1343,7 @@ camel_object_remove_event(void *vo, unsigned int id)
 	g_return_if_fail (id != 0);
 
 	if (obj->hooks == NULL) {
-		g_warning("camel_object_unhook_event: trying to unhook `%u` from an instance of `%s' with no hooks",
+		g_warning("camel_object_unhook_event: trying to unhook '%u' from an instance of '%s' with no hooks",
 			  id, obj->klass->name);
 		return;
 	}
@@ -1373,7 +1373,7 @@ camel_object_remove_event(void *vo, unsigned int id)
 	}
 	camel_object_unget_hooks(obj);
 
-	g_warning("camel_object_unhook_event: cannot find hook id %u in instance of `%s'",
+	g_warning("camel_object_unhook_event: cannot find hook id %u in instance of '%s'",
 		  id, obj->klass->name);
 }
 
@@ -1389,7 +1389,7 @@ camel_object_unhook_event(void *vo, const char * name, CamelObjectEventHookFunc
 	g_return_if_fail (func != NULL);
 
 	if (obj->hooks == NULL) {
-		g_warning("camel_object_unhook_event: trying to unhook `%s` from an instance of `%s' with no hooks",
+		g_warning("camel_object_unhook_event: trying to unhook '%s' from an instance of '%s' with no hooks",
 			  name, obj->klass->name);
 		return;
 	}
@@ -1421,7 +1421,7 @@ camel_object_unhook_event(void *vo, const char * name, CamelObjectEventHookFunc
 	}
 	camel_object_unget_hooks(obj);
 
-	g_warning("camel_object_unhook_event: cannot find hook/data pair %p/%p in an instance of `%s' attached to `%s'",
+	g_warning("camel_object_unhook_event: cannot find hook/data pair %p/%p in an instance of '%s' attached to '%s'",
 		  (void *) func, data, obj->klass->name, name);
 }
 
@@ -1456,7 +1456,7 @@ camel_object_trigger_event(void *vo, const char * name, void *event_data)
 		}
 	}
 
-	g_warning("camel_object_trigger_event: trying to trigger unknown event `%s' in class `%s'",
+	g_warning("camel_object_trigger_event: trying to trigger unknown event '%s' in class '%s'",
 		  name, obj->klass->name);
 
 	return;
diff --git a/camel/camel-offline-journal.c b/camel/camel-offline-journal.c
index bad6b1c6d..23c4804d9 100644
--- a/camel/camel-offline-journal.c
+++ b/camel/camel-offline-journal.c
@@ -161,7 +161,7 @@ camel_offline_journal_write (CamelOfflineJournal *journal, CamelException *ex)
 	
 	if ((fd = g_open (journal->filename, O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, 0666)) == -1) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot write offline journal for folder `%s': %s"),
+				      _("Cannot write offline journal for folder '%s': %s"),
 				      journal->folder->full_name, g_strerror (errno));
 		return -1;
 	}
@@ -184,7 +184,7 @@ camel_offline_journal_write (CamelOfflineJournal *journal, CamelException *ex)
  exception:
 	
 	camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-			      _("Cannot write offline journal for folder `%s': %s"),
+			      _("Cannot write offline journal for folder '%s': %s"),
 			      journal->folder->full_name, g_strerror (errno));
 	
 	fclose (fp);
diff --git a/camel/camel-provider.c b/camel/camel-provider.c
index 3a3fe447c..35183fc24 100644
--- a/camel/camel-provider.c
+++ b/camel/camel-provider.c
@@ -373,7 +373,7 @@ camel_provider_get(const char *url_string, CamelException *ex)
 
 	if (provider == NULL)
 		camel_exception_setv(ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				     _("No provider available for protocol `%s'"),
+				     _("No provider available for protocol '%s'"),
 				     protocol);
 fail:
 	UNLOCK();
diff --git a/camel/camel-sasl-kerberos4.c b/camel/camel-sasl-kerberos4.c
index 30c96d09a..d11c2fee5 100644
--- a/camel/camel-sasl-kerberos4.c
+++ b/camel/camel-sasl-kerberos4.c
@@ -197,7 +197,7 @@ krb4_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
 		 * protection mechanisms supported by the server"
 		 */
 		if (!(token->data[4] & KERBEROS_V4_PROTECTION_NONE)) {
-			g_warning ("Server does not support `no protection' :-(");
+			g_warning ("Server does not support 'no protection' :-(");
 			goto lose;
 		}
 
diff --git a/camel/camel-service.c b/camel/camel-service.c
index 8c29815c7..8f0dbf318 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -492,7 +492,7 @@ camel_service_get_url (CamelService *service)
 static char *
 get_name (CamelService *service, gboolean brief)
 {
-	w(g_warning ("CamelService::get_name not implemented for `%s'",
+	w(g_warning ("CamelService::get_name not implemented for '%s'",
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (service))));
 	return g_strdup ("???");
 }		
diff --git a/camel/camel-session.c b/camel/camel-session.c
index b117ad0db..6d8f90bce 100644
--- a/camel/camel-session.c
+++ b/camel/camel-session.c
@@ -174,7 +174,7 @@ get_service (CamelSession *session, const char *url_string,
 	provider = camel_provider_get(url->protocol, ex);
 	if (provider && !provider->object_types[type]) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("No provider available for protocol `%s'"),
+				      _("No provider available for protocol '%s'"),
 				      url->protocol);
 		provider = NULL;
 	}
diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c
index 4755d22dc..81d81d44d 100644
--- a/camel/camel-smime-context.c
+++ b/camel/camel-smime-context.c
@@ -775,7 +775,7 @@ sm_encrypt(CamelCipherContext *context, const char *userid, GPtrArray *recipient
 	for (i=0;i<recipients->len;i++) {
 		recipient_certs[i] = CERT_FindCertByNicknameOrEmailAddr(p->certdb, recipients->pdata[i]);
 		if (recipient_certs[i] == NULL) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot find certificate for `%s'"), recipients->pdata[i]);
+			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot find certificate for '%s'"), recipients->pdata[i]);
 			goto fail;
 		}
 	}
diff --git a/camel/camel-store.c b/camel/camel-store.c
index 961ee134a..4af85d8ea 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -212,7 +212,7 @@ construct (CamelService *service, CamelSession *session,
 static CamelFolder *
 get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
 {
-	w(g_warning ("CamelStore::get_folder not implemented for `%s'",
+	w(g_warning ("CamelStore::get_folder not implemented for '%s'",
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
 	
 	camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_INVALID,
@@ -249,7 +249,7 @@ camel_store_get_folder (CamelStore *store, const char *folder_name, guint32 flag
 		folder = camel_object_bag_reserve(store->folders, folder_name);
 		if (folder && (flags & CAMEL_STORE_FOLDER_EXCL)) {
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Cannot create folder `%s': folder exists"),
+					      _("Cannot create folder '%s': folder exists"),
 					      folder_name);
                         camel_object_bag_abort (store->folders, folder_name);
 			camel_object_unref (folder);
@@ -309,7 +309,7 @@ static CamelFolderInfo *
 create_folder (CamelStore *store, const char *parent_name,
 	       const char *folder_name, CamelException *ex)
 {
-	w(g_warning ("CamelStore::create_folder not implemented for `%s'",
+	w(g_warning ("CamelStore::create_folder not implemented for '%s'",
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
 	
 	camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_INVALID,
@@ -384,7 +384,7 @@ cs_delete_cached_folder(CamelStore *store, const char *folder_name)
 static void
 delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)
 {
-	w(g_warning ("CamelStore::delete_folder not implemented for `%s'",
+	w(g_warning ("CamelStore::delete_folder not implemented for '%s'",
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
 }
 
@@ -426,7 +426,7 @@ camel_store_delete_folder (CamelStore *store, const char *folder_name, CamelExce
 static void
 rename_folder (CamelStore *store, const char *old_name, const char *new_name, CamelException *ex)
 {
-	w(g_warning ("CamelStore::rename_folder not implemented for `%s'",
+	w(g_warning ("CamelStore::rename_folder not implemented for '%s'",
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
 }
 
@@ -674,7 +674,7 @@ camel_store_sync(CamelStore *store, int expunge, CamelException *ex)
 static CamelFolderInfo *
 get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelException *ex)
 {
-	w(g_warning ("CamelStore::get_folder_info not implemented for `%s'",
+	w(g_warning ("CamelStore::get_folder_info not implemented for '%s'",
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
 	
 	return NULL;
@@ -816,7 +816,7 @@ camel_store_get_folder_info(CamelStore *store, const char *top, guint32 flags, C
 static void
 free_folder_info (CamelStore *store, CamelFolderInfo *fi)
 {
-	w(g_warning ("CamelStore::free_folder_info not implemented for `%s'",
+	w(g_warning ("CamelStore::free_folder_info not implemented for '%s'",
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
 }
 
@@ -1086,7 +1086,7 @@ camel_store_supports_subscriptions (CamelStore *store)
 static gboolean
 folder_subscribed(CamelStore *store, const char *folder_name)
 {
-	w(g_warning ("CamelStore::folder_subscribed not implemented for `%s'",
+	w(g_warning ("CamelStore::folder_subscribed not implemented for '%s'",
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
 	
 	return FALSE;
@@ -1121,7 +1121,7 @@ camel_store_folder_subscribed(CamelStore *store, const char *folder_name)
 static void
 subscribe_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 {
-	w(g_warning ("CamelStore::subscribe_folder not implemented for `%s'",
+	w(g_warning ("CamelStore::subscribe_folder not implemented for '%s'",
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
 }
 
@@ -1149,7 +1149,7 @@ camel_store_subscribe_folder(CamelStore *store, const char *folder_name, CamelEx
 static void
 unsubscribe_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 {
-	w(g_warning ("CamelStore::unsubscribe_folder not implemented for `%s'",
+	w(g_warning ("CamelStore::unsubscribe_folder not implemented for '%s'",
 		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
 }
 
diff --git a/camel/camel-url.c b/camel/camel-url.c
index 1b3196ba6..cad6bdc6f 100644
--- a/camel/camel-url.c
+++ b/camel/camel-url.c
@@ -310,7 +310,7 @@ camel_url_new (const char *url_string, CamelException *ex)
 	if (!url->protocol) {
 		camel_url_free (url);
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-				      _("Could not parse URL `%s'"),
+				      _("Could not parse URL '%s'"),
 				      url_string);
 		return NULL;
 	}
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index bedc44c1f..00c4f1ede 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -483,7 +483,7 @@ vee_sync(CamelFolder *folder, gboolean expunge, CamelException *ex)
 			char *desc;
 
 			camel_object_get(f, NULL, CAMEL_OBJECT_DESCRIPTION, &desc, NULL);
-			camel_exception_setv(ex, ex->id, _("Error storing `%s': %s"), desc, ex->desc);
+			camel_exception_setv(ex, ex->id, _("Error storing '%s': %s"), desc, ex->desc);
 			break;
 		}
 
diff --git a/camel/providers/groupwise/ChangeLog b/camel/providers/groupwise/ChangeLog
index 1439d94d3..74aec9aac 100644
--- a/camel/providers/groupwise/ChangeLog
+++ b/camel/providers/groupwise/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-19  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #531591
+
+	* camel-groupwise-utils.c:
+	* camel-groupwise-folder.c
+	* camel-groupwise-store.c:
+	Don't use TeX-style quotes in user-visible messages.
+
 2008-05-19  Sankar P  <psankar@novell.com>
 
 	* camel-groupwise-folder.c: (groupwise_transfer_messages_to):
diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c
index 531a77563..61c02f610 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.c
+++ b/camel/providers/groupwise/camel-groupwise-folder.c
@@ -2033,7 +2033,7 @@ groupwise_append_message (CamelFolder *folder, CamelMimeMessage *message,
 		is_ok = TRUE;
 
 	if (!is_ok) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot append message to folder `%s': %s"),
+		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot append message to folder '%s': %s"),
 				folder->full_name, e_gw_connection_get_error_message (status));
 		return;
 	}
@@ -2075,7 +2075,7 @@ groupwise_append_message (CamelFolder *folder, CamelMimeMessage *message,
 	status = e_gw_connection_add_item (cnc, container_id, id);
 	g_message ("Adding %s to %s", id, container_id);
 	if (status != E_GW_CONNECTION_STATUS_OK) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot append message to folder `%s': %s"),
+		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot append message to folder '%s': %s"),
 				folder->full_name, e_gw_connection_get_error_message (status));
 
 		if (appended_uid)
diff --git a/camel/providers/groupwise/camel-groupwise-store.c b/camel/providers/groupwise/camel-groupwise-store.c
index e9d03752a..413e75ce2 100644
--- a/camel/providers/groupwise/camel-groupwise-store.c
+++ b/camel/providers/groupwise/camel-groupwise-store.c
@@ -1304,7 +1304,7 @@ groupwise_rename_folder(CamelStore *store,
 	char *temp_new = NULL;
 	
 	if (groupwise_is_system_folder (old_name)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename Groupwise folder `%s' to `%s'"),
+		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename Groupwise folder '%s' to '%s'"),
 				      old_name, new_name);
 		return;
 	}
@@ -1325,7 +1325,7 @@ groupwise_rename_folder(CamelStore *store,
 
 	if (!container_id || e_gw_connection_rename_folder (priv->cnc, container_id , temp_new) != E_GW_CONNECTION_STATUS_OK)
 	{
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename Groupwise folder `%s' to `%s'"),
+		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename Groupwise folder '%s' to '%s'"),
 				      old_name, new_name);
 		CAMEL_SERVICE_REC_UNLOCK (groupwise_store, connect_lock);
 		return;
diff --git a/camel/providers/groupwise/camel-groupwise-utils.c b/camel/providers/groupwise/camel-groupwise-utils.c
index ec96f3480..253cd2289 100644
--- a/camel/providers/groupwise/camel-groupwise-utils.c
+++ b/camel/providers/groupwise/camel-groupwise-utils.c
@@ -83,7 +83,7 @@ e_path_to_physical (const char *prefix, const char *vpath)
 	ppath_len++;	/* For the separating slash.  */
 
 	/* Take account of the fact that we need to translate every
-	 * separator into `subfolders/'.
+	 * separator into 'subfolders/'.
 	 */
 	p = vpath;
 	while (1) {
@@ -117,7 +117,7 @@ e_path_to_physical (const char *prefix, const char *vpath)
 			break;
 		}
 
-		memcpy (dp, p, newp - p + 1); /* `+ 1' to copy the slash too.  */
+		memcpy (dp, p, newp - p + 1); /* '+ 1' to copy the slash too.  */
 		dp += newp - p + 1;
 
 		memcpy (dp, SUBFOLDER_DIR_NAME, SUBFOLDER_DIR_NAME_LEN);
diff --git a/camel/providers/imap/ChangeLog b/camel/providers/imap/ChangeLog
index 3233fd223..d543ef4ac 100644
--- a/camel/providers/imap/ChangeLog
+++ b/camel/providers/imap/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-19  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #531591
+
+	* camel-imap-store.c:
+	* camel-imap-folder.c:
+	Don't use TeX-style quotes in user-visible messages.
+
 2008-04-30  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #274316
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index cb353558d..c11e8456f 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -1181,7 +1181,7 @@ imap_sync_online (CamelFolder *folder, CamelException *ex)
 		/* FIXME: Sankar: What about custom flags ? */
 		flaglist = imap_create_flag_list (unset ? folder->permanent_flags : info->info.flags & folder->permanent_flags, (CamelMessageInfo *)info, folder->permanent_flags);
 
-		/* Note: to `unset' flags, use -FLAGS.SILENT (<flag list>) */
+		/* Note: to 'unset' flags, use -FLAGS.SILENT (<flag list>) */
 		response = camel_imap_command (store, folder, &local_ex,
 					       "UID STORE %s %sFLAGS.SILENT %s",
 					       set, unset ? "-" : "", flaglist);
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index c7399506a..53fd797ce 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -2039,7 +2039,7 @@ get_folder_online (CamelStore *store, const char *folder_name, guint32 flags, Ca
 		}
 	} else if (flags & CAMEL_STORE_FOLDER_EXCL) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot create folder `%s': folder exists."),
+				      _("Cannot create folder '%s': folder exists."),
 				      folder_name);
 		
 		camel_imap_response_free_without_processing (imap_store, response);
diff --git a/camel/providers/imap4/ChangeLog b/camel/providers/imap4/ChangeLog
index 3ae963db3..68df83b46 100644
--- a/camel/providers/imap4/ChangeLog
+++ b/camel/providers/imap4/ChangeLog
@@ -1,3 +1,13 @@
+2008-05-19  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #531591
+
+	* camel-imap4-engine.c:
+	* camel-imap4-folder.c:
+	* camel-imap4-store.c:
+	* camel-imap4-summary.c:
+	Don't use TeX-style quotes in user-visible messages.
+
 2008-05-14  Jeffrey Stedfast  <fejj@novell.com>
 
 	* camel-imap4-folder.c (imap4_getv): Implement support for getting
diff --git a/camel/providers/imap4/camel-imap4-engine.c b/camel/providers/imap4/camel-imap4-engine.c
index b15374eff..ae7e8255e 100644
--- a/camel/providers/imap4/camel-imap4-engine.c
+++ b/camel/providers/imap4/camel-imap4-engine.c
@@ -447,13 +447,13 @@ camel_imap4_engine_select_folder (CamelIMAP4Engine *engine, CamelFolder *folder,
 	case CAMEL_IMAP4_RESULT_NO:
 		/* FIXME: would be good to save the NO reason into the err message */
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot select folder `%s': Invalid mailbox name"),
+				      _("Cannot select folder '%s': Invalid mailbox name"),
 				      folder->full_name);
 		retval = -1;
 		break;
 	case CAMEL_IMAP4_RESULT_BAD:
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot select folder `%s': Bad command"),
+				      _("Cannot select folder '%s': Bad command"),
 				      folder->full_name);
 		retval = -1;
 		break;
diff --git a/camel/providers/imap4/camel-imap4-folder.c b/camel/providers/imap4/camel-imap4-folder.c
index 5c080b975..51e3a2a01 100644
--- a/camel/providers/imap4/camel-imap4-folder.c
+++ b/camel/providers/imap4/camel-imap4-folder.c
@@ -420,7 +420,7 @@ camel_imap4_folder_new (CamelStore *store, const char *full_name, CamelException
 		/* we *do* care if summary loading fails here though */
 		if (camel_folder_summary_load (folder->summary) == -1) {
 			camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_PATH,
-					      _("Cannot access folder `%s': %s"),
+					      _("Cannot access folder '%s': %s"),
 					      full_name, g_strerror (ENOENT));
 			
 			camel_object_unref (folder);
@@ -479,13 +479,13 @@ imap4_sync_flag (CamelFolder *folder, GPtrArray *infos, char onoff, const char *
 		case CAMEL_IMAP4_RESULT_NO:
 			/* FIXME: would be good to save the NO reason into the err message */
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Cannot sync flags to folder `%s': Unknown"),
+					      _("Cannot sync flags to folder '%s': Unknown"),
 					      folder->full_name);
 			retval = -1;
 			break;
 		case CAMEL_IMAP4_RESULT_BAD:
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Cannot sync flags to folder `%s': Bad command"),
+					      _("Cannot sync flags to folder '%s': Bad command"),
 					      folder->full_name);
 			retval = -1;
 			break;
@@ -625,12 +625,12 @@ imap4_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 		case CAMEL_IMAP4_RESULT_NO:
 			/* FIXME: would be good to save the NO reason into the err message */
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Cannot expunge folder `%s': Unknown"),
+					      _("Cannot expunge folder '%s': Unknown"),
 					      folder->full_name);
 			break;
 		case CAMEL_IMAP4_RESULT_BAD:
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Cannot expunge folder `%s': Bad command"),
+					      _("Cannot expunge folder '%s': Bad command"),
 					      folder->full_name);
 			break;
 		}
@@ -886,12 +886,12 @@ imap4_get_message (CamelFolder *folder, const char *uid, CamelException *ex)
 	case CAMEL_IMAP4_RESULT_NO:
 		/* FIXME: would be good to save the NO reason into the err message */
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot get message %s from folder `%s': No such message"),
+				      _("Cannot get message %s from folder '%s': No such message"),
 				      uid, folder->full_name);
 		break;
 	case CAMEL_IMAP4_RESULT_BAD:
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot get message %s from folder `%s': Bad command"),
+				      _("Cannot get message %s from folder '%s': Bad command"),
 				      uid, folder->full_name);
 		break;
 	}
@@ -935,7 +935,7 @@ imap4_append_message (CamelFolder *folder, CamelMimeMessage *message,
 	
 	if (((CamelIMAP4Folder *) folder)->read_only) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot append message to folder `%s': Folder is read-only"),
+				      _("Cannot append message to folder '%s': Folder is read-only"),
 				      folder->full_name);
 		return;
 	}
@@ -1028,7 +1028,7 @@ imap4_append_message (CamelFolder *folder, CamelMimeMessage *message,
 	case CAMEL_IMAP4_RESULT_NO:
 		/* FIXME: can we give the user any more information? */
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot append message to folder `%s': Unknown error"),
+				      _("Cannot append message to folder '%s': Unknown error"),
 				      folder->full_name);
 		
 		for (i = 0; i < ic->resp_codes->len; i++) {
@@ -1058,7 +1058,7 @@ imap4_append_message (CamelFolder *folder, CamelMimeMessage *message,
 		break;
 	case CAMEL_IMAP4_RESULT_BAD:
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot append message to folder `%s': Bad command"),
+				      _("Cannot append message to folder '%s': Bad command"),
 				      folder->full_name);
 		
 		break;
@@ -1178,11 +1178,11 @@ imap4_transfer_messages_to (CamelFolder *src, GPtrArray *uids, CamelFolder *dest
 			/* FIXME: would be good to save the NO reason into the err message */
 			if (move) {
 				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-						      _("Cannot move messages from folder `%s' to folder `%s': Unknown"),
+						      _("Cannot move messages from folder '%s' to folder '%s': Unknown"),
 						      src->full_name, dest->full_name);
 			} else {
 				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-						      _("Cannot copy messages from folder `%s' to folder `%s': Unknown"),
+						      _("Cannot copy messages from folder '%s' to folder '%s': Unknown"),
 						      src->full_name, dest->full_name);
 			}
 			
@@ -1190,11 +1190,11 @@ imap4_transfer_messages_to (CamelFolder *src, GPtrArray *uids, CamelFolder *dest
 		case CAMEL_IMAP4_RESULT_BAD:
 			if (move) {
 				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-						      _("Cannot move messages from folder `%s' to folder `%s': Bad command"),
+						      _("Cannot move messages from folder '%s' to folder '%s': Bad command"),
 						      src->full_name, dest->full_name);
 			} else {
 				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-						      _("Cannot copy messages from folder `%s' to folder `%s': Bad command"),
+						      _("Cannot copy messages from folder '%s' to folder '%s': Bad command"),
 						      src->full_name, dest->full_name);
 			}
 			
diff --git a/camel/providers/imap4/camel-imap4-store.c b/camel/providers/imap4/camel-imap4-store.c
index 5ed81cc80..3df62e425 100644
--- a/camel/providers/imap4/camel-imap4-store.c
+++ b/camel/providers/imap4/camel-imap4-store.c
@@ -737,7 +737,7 @@ imap4_get_folder (CamelStore *store, const char *folder_name, guint32 flags, Cam
 	
 	if (ic->result != CAMEL_IMAP4_RESULT_OK) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot get folder `%s' on IMAP server %s: Unknown"),
+				      _("Cannot get folder '%s' on IMAP server %s: Unknown"),
 				      folder_name, ((CamelService *) store)->url->host);
 		camel_imap4_command_unref (ic);
 		goto done;
@@ -818,7 +818,7 @@ imap4_folder_can_contain_folders (CamelStore *store, const char *folder_name, Ca
 		camel_imap4_command_unref (ic);
 		
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot get LIST information for `%s' on IMAP server %s: %s"),
+				      _("Cannot get LIST information for '%s' on IMAP server %s: %s"),
 				      folder_name, engine->url->host, ic->result == CAMEL_IMAP4_RESULT_BAD ?
 				      _("Bad command") : _("Unknown"));
 		
@@ -899,12 +899,12 @@ imap4_folder_create (CamelStore *store, const char *folder_name, const char *sub
 	case CAMEL_IMAP4_RESULT_NO:
 		/* FIXME: would be good to save the NO reason into the err message */
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot create folder `%s': Invalid mailbox name"),
+				      _("Cannot create folder '%s': Invalid mailbox name"),
 				      folder_name);
 		break;
 	case CAMEL_IMAP4_RESULT_BAD:
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot create folder `%s': Bad command"),
+				      _("Cannot create folder '%s': Bad command"),
 				      folder_name);
 		break;
 	default:
@@ -1010,7 +1010,7 @@ imap4_delete_folder (CamelStore *store, const char *folder_name, CamelException
 
 	if (!g_ascii_strcasecmp (folder_name, "INBOX")) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot delete folder `%s': Special folder"),
+				      _("Cannot delete folder '%s': Special folder"),
 				      folder_name);
 
 		return;
@@ -1076,12 +1076,12 @@ imap4_delete_folder (CamelStore *store, const char *folder_name, CamelException
 	case CAMEL_IMAP4_RESULT_NO:
 		/* FIXME: would be good to save the NO reason into the err message */
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot delete folder `%s': Invalid mailbox name"),
+				      _("Cannot delete folder '%s': Invalid mailbox name"),
 				      folder_name);
 		break;
 	case CAMEL_IMAP4_RESULT_BAD:
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot delete folder `%s': Bad command"),
+				      _("Cannot delete folder '%s': Bad command"),
 				      folder_name);
 		break;
 	}
@@ -1101,7 +1101,7 @@ imap4_rename_folder (CamelStore *store, const char *old_name, const char *new_na
 	
 	if (!g_ascii_strcasecmp (old_name, "INBOX")) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot rename folder `%s' to `%s': Special folder"),
+				      _("Cannot rename folder '%s' to '%s': Special folder"),
 				      old_name, new_name);
 		
 		return;
@@ -1139,12 +1139,12 @@ imap4_rename_folder (CamelStore *store, const char *old_name, const char *new_na
 	case CAMEL_IMAP4_RESULT_NO:
 		/* FIXME: would be good to save the NO reason into the err message */
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot rename folder `%s' to `%s': Invalid mailbox name"),
+				      _("Cannot rename folder '%s' to '%s': Invalid mailbox name"),
 				      old_name, new_name);
 		break;
 	case CAMEL_IMAP4_RESULT_BAD:
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot rename folder `%s' to `%s': Bad command"),
+				      _("Cannot rename folder '%s' to '%s': Bad command"),
 				      old_name, new_name);
 		break;
 	}
@@ -1572,7 +1572,7 @@ imap4_get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelE
 		camel_imap4_command_unref (ic);
 		
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot get %s information for pattern `%s' on IMAP server %s: %s"),
+				      _("Cannot get %s information for pattern '%s' on IMAP server %s: %s"),
 				      cmd, pattern, engine->url->host, ic->result == CAMEL_IMAP4_RESULT_BAD ?
 				      _("Bad command") : _("Unknown"));
 		
@@ -1678,12 +1678,12 @@ imap4_subscribe_folder (CamelStore *store, const char *folder_name, CamelExcepti
 	case CAMEL_IMAP4_RESULT_NO:
 		/* FIXME: would be good to save the NO reason into the err message */
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot subscribe to folder `%s': Invalid mailbox name"),
+				      _("Cannot subscribe to folder '%s': Invalid mailbox name"),
 				      folder_name);
 		break;
 	case CAMEL_IMAP4_RESULT_BAD:
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot subscribe to folder `%s': Bad command"),
+				      _("Cannot subscribe to folder '%s': Bad command"),
 				      folder_name);
 		break;
 	}
@@ -1750,12 +1750,12 @@ imap4_unsubscribe_folder (CamelStore *store, const char *folder_name, CamelExcep
 	case CAMEL_IMAP4_RESULT_NO:
 		/* FIXME: would be good to save the NO reason into the err message */
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot unsubscribe from folder `%s': Invalid mailbox name"),
+				      _("Cannot unsubscribe from folder '%s': Invalid mailbox name"),
 				      folder_name);
 		break;
 	case CAMEL_IMAP4_RESULT_BAD:
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot unsubscribe from folder `%s': Bad command"),
+				      _("Cannot unsubscribe from folder '%s': Bad command"),
 				      folder_name);
 		break;
 	}
diff --git a/camel/providers/imap4/camel-imap4-summary.c b/camel/providers/imap4/camel-imap4-summary.c
index b4f0ddef0..911d4becb 100644
--- a/camel/providers/imap4/camel-imap4-summary.c
+++ b/camel/providers/imap4/camel-imap4-summary.c
@@ -446,7 +446,7 @@ decode_references (const char *refstr, const char *irtstr)
 		return NULL;
 	
 	if (irt) {
-		/* The References field is populated from the `References' and/or `In-Reply-To'
+		/* The References field is populated from the 'References' and/or 'In-Reply-To'
 		   headers. If both headers exist, take the first thing in the In-Reply-To header
 		   that looks like a Message-ID, and append it to the References header. */
 		
diff --git a/camel/providers/local/ChangeLog b/camel/providers/local/ChangeLog
index c63be92fd..6da202e58 100644
--- a/camel/providers/local/ChangeLog
+++ b/camel/providers/local/ChangeLog
@@ -1,3 +1,16 @@
+2008-05-19  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #531591
+
+	* camel-spool-summary.c:
+	* camel-local-provider.c:
+	* camel-local-store.c:
+	* camel-spool-store.c:
+	* camel-mh-store.c:
+	* camel-mbox-store.c:
+	* camel-maildir-store.c:
+	Don't use TeX-style quotes in user-visible messages.
+
 2008-04-04  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #522433
diff --git a/camel/providers/local/camel-local-provider.c b/camel/providers/local/camel-local-provider.c
index 679aba434..cca5897a8 100644
--- a/camel/providers/local/camel-local-provider.c
+++ b/camel/providers/local/camel-local-provider.c
@@ -45,7 +45,7 @@ static CamelProviderConfEntry mh_conf_entries[] = {
 	CAMEL_PROVIDER_CONF_DEFAULT_PATH,
 	{ CAMEL_PROVIDER_CONF_SECTION_START, "general", NULL, N_("Options") },
 	{ CAMEL_PROVIDER_CONF_CHECKBOX, "dotfolders", NULL,
-	  N_("_Use the `.folders' folder summary file (exmh)"), "0" },
+	  N_("_Use the '.folders' folder summary file (exmh)"), "0" },
 	{ CAMEL_PROVIDER_CONF_SECTION_END },
 	{ CAMEL_PROVIDER_CONF_END }
 };
diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c
index f6be4fcd8..c58150f02 100644
--- a/camel/providers/local/camel-local-store.c
+++ b/camel/providers/local/camel-local-store.c
@@ -449,7 +449,7 @@ delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 	str = g_strdup_printf("%s.ev-summary", name);
 	if (g_unlink(str) == -1 && errno != ENOENT) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not delete folder summary file `%s': %s"),
+				      _("Could not delete folder summary file '%s': %s"),
 				      str, g_strerror (errno));
 		g_free(str);
 		g_free (name);
@@ -459,7 +459,7 @@ delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 	str = g_strdup_printf("%s.ev-summary-meta", name);
 	if (g_unlink(str) == -1 && errno != ENOENT) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not delete folder summary file `%s': %s"),
+				      _("Could not delete folder summary file '%s': %s"),
 				      str, g_strerror (errno));
 		g_free(str);
 		g_free (name);
@@ -469,7 +469,7 @@ delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 	str = g_strdup_printf("%s.ibex", name);
 	if (camel_text_index_remove(str) == -1 && errno != ENOENT) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not delete folder index file `%s': %s"),
+				      _("Could not delete folder index file '%s': %s"),
 				      str, g_strerror (errno));
 		g_free(str);
 		g_free (name);
@@ -492,7 +492,7 @@ delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 	
 	if (g_unlink (str) == -1 && errno != ENOENT) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not delete folder meta file `%s': %s"),
+				      _("Could not delete folder meta file '%s': %s"),
 				      str, g_strerror (errno));
 		g_free (name);
 		g_free (str);
diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index 058d37302..f486f9c3e 100644
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -144,7 +144,7 @@ get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelExce
 			    || mkdir(cur, 0700) != 0
 			    || mkdir(new, 0700) != 0) {
 				camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-						     _("Cannot create folder `%s': %s"),
+						     _("Cannot create folder '%s': %s"),
 						     folder_name, g_strerror(errno));
 				rmdir(tmp);
 				rmdir(cur);
@@ -157,11 +157,11 @@ get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelExce
 		/* folder doesn't exist, see if we should create it */
 		if (errno != ENOENT) {
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Cannot get folder `%s': %s"),
+					      _("Cannot get folder '%s': %s"),
 					      folder_name, g_strerror (errno));
 		} else if ((flags & CAMEL_STORE_FOLDER_CREATE) == 0) {
 			camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-					      _("Cannot get folder `%s': folder does not exist."),
+					      _("Cannot get folder '%s': folder does not exist."),
 					      folder_name);
 		} else {
 			if (mkdir(name, 0700) != 0
@@ -169,7 +169,7 @@ get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelExce
 			    || mkdir(cur, 0700) != 0
 			    || mkdir(new, 0700) != 0) {
 				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-						      _("Cannot create folder `%s': %s"),
+						      _("Cannot create folder '%s': %s"),
 						      folder_name, g_strerror (errno));
 				rmdir(tmp);
 				rmdir(cur);
@@ -185,10 +185,10 @@ get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelExce
 		   || stat(new, &st) != 0 || !S_ISDIR(st.st_mode)) {
 		/* folder exists, but not maildir */
 		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot get folder `%s': not a maildir directory."), name);
+				     _("Cannot get folder '%s': not a maildir directory."), name);
 	} else if (flags & CAMEL_STORE_FOLDER_EXCL) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot create folder `%s': folder exists."),
+				      _("Cannot create folder '%s': folder exists."),
 				      folder_name);
 	} else {
 		folder = camel_maildir_folder_new(store, folder_name, flags, ex);
@@ -230,7 +230,7 @@ static void delete_folder(CamelStore * store, const char *folder_name, CamelExce
 	    || stat(cur, &st) == -1 || !S_ISDIR(st.st_mode)
 	    || stat(new, &st) == -1 || !S_ISDIR(st.st_mode)) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not delete folder `%s': %s"),
+				      _("Could not delete folder '%s': %s"),
 				      folder_name, errno ? g_strerror (errno) :
 				      _("not a maildir directory"));
 	} else {
@@ -268,7 +268,7 @@ static void delete_folder(CamelStore * store, const char *folder_name, CamelExce
 			mkdir(new, 0700);
 			mkdir(tmp, 0700);
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Could not delete folder `%s': %s"),
+					      _("Could not delete folder '%s': %s"),
 					      folder_name, g_strerror (err));
 		} else {
 			/* and remove metadata */
@@ -436,7 +436,7 @@ scan_dirs(CamelStore *store, guint32 flags, CamelFolderInfo *topfi, CamelURL *ur
 		if (dir == NULL) {
 			g_free(name);
 			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not scan folder `%s': %s"),
+					     _("Could not scan folder '%s': %s"),
 					     root, g_strerror(errno));
 			goto fail;
 		}
diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c
index 85adad913..9d0dded0c 100644
--- a/camel/providers/local/camel-mbox-store.c
+++ b/camel/providers/local/camel-mbox-store.c
@@ -144,7 +144,7 @@ get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelExcep
 		
 		if (errno != ENOENT) {
 			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Cannot get folder `%s': %s"),
+					     _("Cannot get folder '%s': %s"),
 					     folder_name, g_strerror (errno));
 			g_free(name);
 			return NULL;
@@ -152,7 +152,7 @@ get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelExcep
 		
 		if ((flags & CAMEL_STORE_FOLDER_CREATE) == 0) {
 			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-					     _("Cannot get folder `%s': folder does not exist."),
+					     _("Cannot get folder '%s': folder does not exist."),
 					     folder_name);
 			g_free(name);
 			return NULL;
@@ -173,7 +173,7 @@ get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelExcep
 		dirname = g_path_get_dirname(name);
 		if (g_mkdir_with_parents(dirname, 0777) == -1 && errno != EEXIST) {
 			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Cannot create folder `%s': %s"),
+					     _("Cannot create folder '%s': %s"),
 					     folder_name, g_strerror (errno));
 			g_free(dirname);
 			g_free(name);
@@ -185,7 +185,7 @@ get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelExcep
 		fd = g_open(name, O_LARGEFILE | O_WRONLY | O_CREAT | O_APPEND | O_BINARY, 0666);
 		if (fd == -1) {
 			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Cannot create folder `%s': %s"),
+					     _("Cannot create folder '%s': %s"),
 					     folder_name, g_strerror (errno));
 			g_free(name);
 			return NULL;
@@ -195,13 +195,13 @@ get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelExcep
 		close(fd);
 	} else if (!S_ISREG(st.st_mode)) {
 		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot get folder `%s': not a regular file."),
+				     _("Cannot get folder '%s': not a regular file."),
 				     folder_name);
 		g_free(name);
 		return NULL;
 	} else if (flags & CAMEL_STORE_FOLDER_EXCL) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot create folder `%s': folder exists."),
+				      _("Cannot create folder '%s': folder exists."),
 				      folder_name);
 		g_free (name);
 		return NULL;
@@ -225,7 +225,7 @@ delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 	
 	if (g_rmdir(path) == -1 && errno != ENOENT) {
 		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not delete folder `%s':\n%s"),
+				     _("Could not delete folder '%s':\n%s"),
 				     folder_name, g_strerror(errno));
 		g_free(path);
 		g_free(name);
@@ -236,7 +236,7 @@ delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 	
 	if (g_stat(name, &st) == -1) {
 		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not delete folder `%s':\n%s"),
+				     _("Could not delete folder '%s':\n%s"),
 				     folder_name, g_strerror(errno));
 		g_free(name);
 		return;
@@ -244,14 +244,14 @@ delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 	
 	if (!S_ISREG(st.st_mode)) {
 		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				     _("`%s' is not a regular file."), name);
+				     _("'%s' is not a regular file."), name);
 		g_free(name);
 		return;
 	}
 	
 	if (st.st_size != 0) {
 		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_NON_EMPTY,
-				     _("Folder `%s' is not empty. Not deleted."),
+				     _("Folder '%s' is not empty. Not deleted."),
 				     folder_name);
 		g_free(name);
 		return;
@@ -259,7 +259,7 @@ delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 	
 	if (g_unlink(name) == -1 && errno != ENOENT) {
 		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not delete folder `%s':\n%s"),
+				     _("Could not delete folder '%s':\n%s"),
 				     name, g_strerror(errno));
 		g_free(name);
 		return;
@@ -273,7 +273,7 @@ delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 	path = camel_local_store_get_meta_path(store, folder_name, ".ev-summary");
 	if (g_unlink(path) == -1 && errno != ENOENT) {
 		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not delete folder summary file `%s': %s"),
+				     _("Could not delete folder summary file '%s': %s"),
 				     path, g_strerror(errno));
 		g_free(path);
 		g_free(name);
@@ -285,7 +285,7 @@ delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 	path = camel_local_store_get_meta_path(store, folder_name, ".ev-summary-meta");
 	if (g_unlink(path) == -1 && errno != ENOENT) {
 		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not delete folder summary file `%s': %s"),
+				     _("Could not delete folder summary file '%s': %s"),
 				     path, g_strerror(errno));
 		g_free(path);
 		g_free(name);
@@ -297,7 +297,7 @@ delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 	path = camel_local_store_get_meta_path(store, folder_name, ".ibex");
 	if (camel_text_index_remove(path) == -1 && errno != ENOENT) {
 		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not delete folder index file `%s': %s"),
+				     _("Could not delete folder index file '%s': %s"),
 				     path, g_strerror(errno));
 		g_free(path);
 		g_free(name);
@@ -321,7 +321,7 @@ delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
 
 	if (g_unlink(path) == -1 && errno != ENOENT) {
 		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Could not delete folder meta file `%s': %s"),
+				     _("Could not delete folder meta file '%s': %s"),
 				     path, g_strerror(errno));
 
 		g_free(path);
@@ -375,7 +375,7 @@ create_folder(CamelStore *store, const char *parent_name, const char *folder_nam
 	
 	dir = g_path_get_dirname(path);
 	if (g_mkdir_with_parents(dir, 0777) == -1 && errno != EEXIST) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot create directory `%s': %s."),
+		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot create directory '%s': %s."),
 				     dir, g_strerror(errno));
 		
 		g_free(path);
@@ -495,7 +495,7 @@ rename_folder(CamelStore *store, const char *old, const char *new, CamelExceptio
 	if (g_mkdir_with_parents(newdir, 0777) == -1) {
 		if (errno != EEXIST) {
 			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not rename `%s': `%s': %s"),
+					     _("Could not rename '%s': '%s': %s"),
 					     old, new, g_strerror(errno));
 			g_free(oldibex);
 			g_free(newibex);
diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c
index ef01b7974..e5755cb25 100644
--- a/camel/providers/local/camel-mh-store.c
+++ b/camel/providers/local/camel-mh-store.c
@@ -214,14 +214,14 @@ get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelExce
 	if (stat(name, &st) == -1) {
 		if (errno != ENOENT) {
 			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Cannot get folder `%s': %s"),
+					     _("Cannot get folder '%s': %s"),
 					     folder_name, g_strerror (errno));
 			g_free (name);
 			return NULL;
 		}
 		if ((flags & CAMEL_STORE_FOLDER_CREATE) == 0) {
 			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-					     _("Cannot get folder `%s': folder does not exist."),
+					     _("Cannot get folder '%s': folder does not exist."),
 					     folder_name);
 			g_free (name);
 			return NULL;
@@ -229,7 +229,7 @@ get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelExce
 
 		if (mkdir(name, 0777) != 0) {
 			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not create folder `%s': %s"),
+					     _("Could not create folder '%s': %s"),
 					     folder_name, g_strerror (errno));
 			g_free (name);
 			return NULL;
@@ -241,12 +241,12 @@ get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelExce
 			folders_update(((CamelLocalStore *)store)->toplevel_dir, UPDATE_ADD, folder_name, NULL);
 	} else if (!S_ISDIR(st.st_mode)) {
 		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				     _("Cannot get folder `%s': not a directory."), folder_name);
+				     _("Cannot get folder '%s': not a directory."), folder_name);
 		g_free (name);
 		return NULL;
 	} else if (flags & CAMEL_STORE_FOLDER_EXCL) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot create folder `%s': folder exists."), folder_name);
+				      _("Cannot create folder '%s': folder exists."), folder_name);
 		g_free (name);
 		return NULL;
 	}
@@ -270,7 +270,7 @@ static void delete_folder(CamelStore * store, const char *folder_name, CamelExce
 	name = g_strdup_printf("%s%s", CAMEL_LOCAL_STORE(store)->toplevel_dir, folder_name);
 	if (rmdir(name) == -1) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not delete folder `%s': %s"),
+				      _("Could not delete folder '%s': %s"),
 				      folder_name, g_strerror (errno));
 		g_free(name);
 		return;
diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c
index 99d5df14e..716eca1db 100644
--- a/camel/providers/local/camel-spool-store.c
+++ b/camel/providers/local/camel-spool-store.c
@@ -132,7 +132,7 @@ construct (CamelService *service, CamelSession *session, CamelProvider *provider
 
 	if (stat(service->url->path, &st) == -1) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				      _("Spool `%s' cannot be opened: %s"),
+				      _("Spool '%s' cannot be opened: %s"),
 				      service->url->path, g_strerror (errno));
 		return;
 	}
@@ -144,7 +144,7 @@ construct (CamelService *service, CamelSession *session, CamelProvider *provider
 		((CamelSpoolStore *)service)->type = CAMEL_SPOOL_STORE_ELM;
 	else {
 		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-				     _("Spool `%s' is not a regular file or directory"),
+				     _("Spool '%s' is not a regular file or directory"),
 				     service->url->path);
 		return;
 	}
@@ -163,7 +163,7 @@ get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelExce
 	if (((CamelSpoolStore *)store)->type == CAMEL_SPOOL_STORE_MBOX) {
 		if (strcmp(folder_name, "INBOX") != 0) {
 			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-					     _("Folder `%s/%s' does not exist."),
+					     _("Folder '%s/%s' does not exist."),
 					     ((CamelService *)store)->url->path, folder_name);
 		} else {
 			folder = camel_spool_folder_new(store, folder_name, flags, ex);
@@ -173,16 +173,16 @@ get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelExce
 		if (stat(name, &st) == -1) {
 			if (errno != ENOENT) {
 				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-						      _("Could not open folder `%s':\n%s"),
+						      _("Could not open folder '%s':\n%s"),
 						      folder_name, g_strerror (errno));
 			} else if ((flags & CAMEL_STORE_FOLDER_CREATE) == 0) {
 				camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-						      _("Folder `%s' does not exist."),
+						      _("Folder '%s' does not exist."),
 						      folder_name);
 			} else {
 				if (creat (name, 0600) == -1) {
 					camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-							      _("Could not create folder `%s':\n%s"),
+							      _("Could not create folder '%s':\n%s"),
 							      folder_name, g_strerror (errno));
 				} else {
 					folder = camel_spool_folder_new(store, folder_name, flags, ex);
@@ -190,7 +190,7 @@ get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelExce
 			}
 		} else if (!S_ISREG(st.st_mode)) {
 			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
-					     _("`%s' is not a mailbox file."), name);
+					     _("'%s' is not a mailbox file."), name);
 		} else {
 			folder = camel_spool_folder_new(store, folder_name, flags, ex);
 		}
@@ -328,7 +328,7 @@ static int scan_dir(CamelStore *store, GHashTable *visited, char *root, const ch
 
 	if (stat(name, &st) == -1) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not scan folder `%s': %s"),
+				      _("Could not scan folder '%s': %s"),
 				      name, g_strerror (errno));
 	} else if (S_ISREG(st.st_mode)) {
 		/* incase we start scanning from a file.  messy duplication :-/ */
@@ -342,7 +342,7 @@ static int scan_dir(CamelStore *store, GHashTable *visited, char *root, const ch
 	dir = opendir(name);
 	if (dir == NULL) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not scan folder `%s': %s"),
+				      _("Could not scan folder '%s': %s"),
 				      name, g_strerror (errno));
 		return -1;
 	}
diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c
index c64805d34..6d3a73f73 100644
--- a/camel/providers/local/camel-spool-summary.c
+++ b/camel/providers/local/camel-spool-summary.c
@@ -236,7 +236,7 @@ spool_summary_sync_full(CamelMboxSummary *cls, gboolean expunge, CamelFolderChan
 		if (size == -1) {
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 					      _("Could not sync spool folder %s: %s\n"
-						"Folder may be corrupt, copy saved in `%s'"),
+						"Folder may be corrupt, copy saved in '%s'"),
 					      ((CamelLocalSummary *)cls)->folder_path,
 					      g_strerror (errno), tmpname);
 			/* so we dont delete it */
@@ -253,7 +253,7 @@ spool_summary_sync_full(CamelMboxSummary *cls, gboolean expunge, CamelFolderChan
 	if (ftruncate(fd, outlen) == -1) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 				      _("Could not sync spool folder %s: %s\n"
-					"Folder may be corrupt, copy saved in `%s'"),
+					"Folder may be corrupt, copy saved in '%s'"),
 				      ((CamelLocalSummary *)cls)->folder_path,
 				      g_strerror (errno), tmpname);
 		tmpname[0] = '\0';
@@ -264,7 +264,7 @@ spool_summary_sync_full(CamelMboxSummary *cls, gboolean expunge, CamelFolderChan
 		g_warning("Cannot close source folder: %s", strerror (errno));
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 				      _("Could not sync spool folder %s: %s\n"
-					"Folder may be corrupt, copy saved in `%s'"),
+					"Folder may be corrupt, copy saved in '%s'"),
 				      ((CamelLocalSummary *)cls)->folder_path,
 				      g_strerror (errno), tmpname);
 		tmpname[0] = '\0';
diff --git a/camel/providers/pop3/ChangeLog b/camel/providers/pop3/ChangeLog
index 7fada2217..46ad5b9bb 100644
--- a/camel/providers/pop3/ChangeLog
+++ b/camel/providers/pop3/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-19  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #531591
+
+	* camel-pop3-store.c:
+	Don't use TeX-style quotes in user-visible messages.
+
 2008-05-11  Jeffrey Stedfast  <fejj@novell.com>
 
 	* camel-pop3-stream.c (stream_fill): Use memmove() instead of
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 0e54dc7fe..6bf8e4d04 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -416,7 +416,7 @@ try_sasl(CamelPOP3Store *store, const char *mech, CamelException *ex)
 			break;
 		if (strncmp((char *) line, "-ERR", 4) == 0) {
 			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-					      _("SASL `%s' Login failed for POP server %s: %s"),
+					      _("SASL '%s' Login failed for POP server %s: %s"),
 					      mech, CAMEL_SERVICE (store)->url->host, line);
 			goto done;
 		}
@@ -660,7 +660,7 @@ get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelExce
 {
 	if (g_ascii_strcasecmp (folder_name, "inbox") != 0) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,
-				      _("No such folder `%s'."), folder_name);
+				      _("No such folder '%s'."), folder_name);
 		return NULL;
 	}
 	return camel_pop3_folder_new (store, ex);
diff --git a/camel/tests/message/test4.c b/camel/tests/message/test4.c
index ea3ebdfc1..b07b449db 100644
--- a/camel/tests/message/test4.c
+++ b/camel/tests/message/test4.c
@@ -104,7 +104,7 @@ int main (int argc, char **argv)
 			continue;
 		}
 		
-		push ("testing message `%s`", filename);
+		push ("testing message '%s'", filename);
 		g_free (filename);
 		
 		stream = camel_stream_fs_new_with_fd (fd);
diff --git a/camel/tests/mime-filter/test-tohtml.c b/camel/tests/mime-filter/test-tohtml.c
index 5b7842fef..e676ddcfd 100644
--- a/camel/tests/mime-filter/test-tohtml.c
+++ b/camel/tests/mime-filter/test-tohtml.c
@@ -30,7 +30,7 @@ test_filter(CamelMimeFilter *f, const char *inname, const char *outname)
 	CamelStream *indisk, *outdisk, *filter;
 	int id;
 
-	camel_test_push("Data file `%s'", inname);
+	camel_test_push("Data file '%s'", inname);
 
 	camel_test_push("setup");