--- libsylph\codeconv.c	Wed Aug 24 01:15:28 2011
+++ ..\libsylph\codeconv.c	Fri Nov 18 14:55:34 2011
@@ -784,8 +784,8 @@
 {
 	static iconv_t cd = (iconv_t)-1;
 	static gboolean iconv_ok = TRUE;
-	S_LOCK_DEFINE_STATIC(cd);
 	gchar *ret;
+	S_LOCK_DEFINE_STATIC(cd);
 
 	S_LOCK(cd);
 
@@ -821,8 +821,8 @@
 {
 	static iconv_t cd = (iconv_t)-1;
 	static gboolean iconv_ok = TRUE;
-	S_LOCK_DEFINE_STATIC(cd);
 	gchar *ret;
+	S_LOCK_DEFINE_STATIC(cd);
 
 	S_LOCK(cd);
 
@@ -880,8 +880,8 @@
 {
 	static iconv_t cd = (iconv_t)-1;
 	static gboolean iconv_ok = TRUE;
-	S_LOCK_DEFINE_STATIC(cd);
 	gchar *ret;
+	S_LOCK_DEFINE_STATIC(cd);
 
 	S_LOCK(cd);
 
@@ -919,8 +919,8 @@
 {
 	static iconv_t cd = (iconv_t)-1;
 	static gboolean iconv_ok = TRUE;
-	S_LOCK_DEFINE_STATIC(cd);
 	gchar *ret;
+	S_LOCK_DEFINE_STATIC(cd);
 
 	S_LOCK(cd);
 
@@ -1900,10 +1900,9 @@
 static GHashTable *conv_get_charset_from_str_table(void)
 {
 	static GHashTable *table;
-	S_LOCK_DEFINE_STATIC(table);
-
 	gint i;
 
+	S_LOCK_DEFINE_STATIC(table);
 	S_LOCK(table);
 
 	if (table) {
--- libsylph\procmsg.c	Wed Aug 24 01:15:28 2011
+++ ..\libsylph\procmsg.c	Wed Aug 24 14:16:17 2011
@@ -1963,9 +1963,9 @@
 	}
 
 	for (i = 0; i < total; i++) {
-		msginfo = msg_array[i];
 		off_t out_size;
 		gint empty_line_size = 0;
+		msginfo = msg_array[i];
 
 		fp = procmsg_open_message_decrypted(msginfo, &mimeinfo);
 		if (!fp) {
--- libsylph\imap.c	Tue Dec 27 17:00:55 2011
+++ ..\libsylph\imap.c	Tue Dec 27 17:36:02 2011
@@ -2899,6 +2899,7 @@
 	SockInfo *sock = NULL;
 	const gchar *server_;
 	gushort port_;
+	gint conn_id;
 
 	if (socks_info) {
 		server_ = socks_info->proxy_host;
@@ -2909,8 +2910,6 @@
 	}
 
 #if USE_THREADS
-	gint conn_id;
-
 	if ((conn_id = sock_connect_async_thread(server_, port_)) < 0 ||
 	    sock_connect_async_thread_wait(conn_id, &sock) < 0) {
 		log_warning(_("Can't connect to IMAP4 server: %s:%d\n"),