--- a/src/lib-storage/mail-storage-private.h	Wed Jul 15 18:29:21 2009 -0400
+++ b/src/lib-storage/mail-storage-private.h	Wed Jul 15 18:29:42 2009 -0400
@@ -429,8 +429,6 @@
 
 const char *mail_generate_guid_string(void);
 void mail_generate_guid_128(uint8_t guid[MAIL_GUID_128_SIZE]);
-void mail_generate_guid_128_hash(const char *input,
-				 uint8_t guid[MAIL_GUID_128_SIZE]);
 int mail_set_aborted(struct mail *mail);
 void mail_set_expunged(struct mail *mail);
 void mailbox_set_deleted(struct mailbox *box);

--- a/src/lib-storage/mail-storage.c	Wed Jul 15 18:29:21 2009 -0400
+++ b/src/lib-storage/mail-storage.c	Wed Jul 15 18:29:42 2009 -0400
@@ -1073,17 +1073,6 @@
 	box->mailbox_deleted = TRUE;
 }
 
-bool mail_guid_128_is_empty(const uint8_t guid_128[MAIL_GUID_128_SIZE])
-{
-	unsigned int i;
-
-	for (i = 0; i < MAILBOX_GUID_SIZE; i++) {
-		if (guid_128[i] != 0)
-			return FALSE;
-	}
-	return TRUE;
-}
-
 bool mailbox_guid_is_empty(const uint8_t guid[MAILBOX_GUID_SIZE])
 {
 	return mail_guid_128_is_empty(guid);

--- a/src/lib-storage/mail-storage.h	Wed Jul 15 18:29:21 2009 -0400
+++ b/src/lib-storage/mail-storage.h	Wed Jul 15 18:29:42 2009 -0400
@@ -642,4 +642,10 @@
 /* Mark a cached field corrupted and have it recalculated. */
 void mail_set_cache_corrupted(struct mail *mail, enum mail_fetch_field field);
 
+/* Return 128 bit GUID using input string. If guid is already 128 bit hex
+   encoded, it's returned as-is. Otherwise SHA1 sum is taken and its last
+   128 bits are returned. */
+void mail_generate_guid_128_hash(const char *guid,
+				 uint8_t guid_128[MAIL_GUID_128_SIZE]);
+
 #endif

--- a/src/lib-storage/mail.c	Wed Jul 15 18:29:21 2009 -0400
+++ b/src/lib-storage/mail.c	Wed Jul 15 18:29:42 2009 -0400
@@ -280,19 +280,19 @@
 	memcpy(guid + 8, guid_static, 8);
 }
 
-void mail_generate_guid_128_hash(const char *input,
-				 uint8_t guid[MAIL_GUID_128_SIZE])
+void mail_generate_guid_128_hash(const char *guid,
+				 uint8_t guid_128[MAIL_GUID_128_SIZE])
 {
 	unsigned char sha1_sum[SHA1_RESULTLEN];
 	buffer_t buf;
 
-	buffer_create_data(&buf, guid, MAIL_GUID_128_SIZE);
-	if (strlen(input) != MAIL_GUID_128_SIZE*2 ||
-	    hex_to_binary(input, &buf) < 0 ||
+	buffer_create_data(&buf, guid_128, MAIL_GUID_128_SIZE);
+	if (strlen(guid) != MAIL_GUID_128_SIZE*2 ||
+	    hex_to_binary(guid, &buf) < 0 ||
 	    buf.used != MAIL_GUID_128_SIZE) {
 		/* not 128bit hex. use a hash of it instead. */
 		buffer_set_used_size(&buf, 0);
-		sha1_get_digest(input, strlen(input), sha1_sum);
+		sha1_get_digest(guid, strlen(guid), sha1_sum);
 #if SHA1_RESULTLEN < DBOX_GUID_BIN_LEN
 #  error not possible
 #endif
@@ -301,3 +301,14 @@
 			      MAIL_GUID_128_SIZE);
 	}
 }
+
+bool mail_guid_128_is_empty(const uint8_t guid_128[MAIL_GUID_128_SIZE])
+{
+	unsigned int i;
+
+	for (i = 0; i < MAILBOX_GUID_SIZE; i++) {
+		if (guid_128[i] != 0)
+			return FALSE;
+	}
+	return TRUE;
+}