X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fimap.c;h=493ff31da6e2c8ef4b1badb964849a4947bd2129;hp=ebf45bb81752ff09a3b7edccef316f2a04ee1e54;hb=af33e4fafbd2c2037900f2effd45fe4e6787f586;hpb=c16092297d3da843e7be9ae168e395db16ba74dc

diff --git a/src/imap.c b/src/imap.c
index ebf45bb81..493ff31da 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -4804,10 +4804,9 @@ bail:
 				GSList *tags = g_hash_table_lookup(tags_hash, GINT_TO_POINTER(msginfo->msgnum));
 				GSList *cur;
 
-				if (tags != NULL) {
-					g_slist_free(msginfo->tags);
-					msginfo->tags = NULL;
-				}
+				g_slist_free(msginfo->tags);
+				msginfo->tags = NULL;
+
 				for (cur = tags; cur; cur = cur->next) {
 					gchar *real_tag = imap_modified_utf7_to_utf8(cur->data, TRUE);
 					gint id = 0;
@@ -4816,11 +4815,9 @@ bail:
 						id = tags_add_tag(real_tag);
 						got_alien_tags = TRUE;
 					}
-					if (!g_slist_find(msginfo->tags, GINT_TO_POINTER(id))) {
-						msginfo->tags = g_slist_append(
+					msginfo->tags = g_slist_append(
 								msginfo->tags,
 								GINT_TO_POINTER(id));
-					}
 					g_free(real_tag);
 				}
 				slist_free_strings(tags);