removed debug prints, updated def file and updated Windows ico file. Made 3.0.0beta2 release.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2347 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2009-11-16 06:22:44 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2009-11-16 06:22:44 +0000
commit: d216d4d51ce9e34129d4c6fbf5c9ff91ea6cf75e (patch)
tree: d73c56e64afb1a884bc84e9c7abf663e92acbe2d
parent: 722da9ea2d6849dbb4548c33c0946bbc7db11872 (diff)
35 files changed, 3645 insertions, 3627 deletions
diff --git a/ChangeLog b/ChangeLog
index c8dac496..3acfb630 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-16
+
+	* version 3.0.0beta2
+
+2009-11-16
+
+	* src/icons/sylpheed.ico: added 48x48(32bpp), 32x32(32bpp),
+	  16x16(32bpp) icons.
+
+2009-11-13
+
+	* libsylph/imap.c: removed redundant debug print.
+	* libsylph/libsylph-0.def: updated.
+
 2009-11-13
 
 	* src/addressbook.c: added sort order change (but disabled because of
diff --git a/NEWS b/NEWS
index b782a210..a2da5109 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
 Changes of Sylpheed
 
+* 3.0.0beta2 (development)
+
+    * Many important bugs related to multi-threading were fixed.
+    * The unintended drag start on IMAP folders was fixed.
+    * The libtool version was increased to prevent linking problem.
+    * Several new APIs were added to the plug-in library.
+    * Win32: 48x48(32bpp) icon was added.
+
 * 3.0.0beta1 (development)
 
     * Multi-threading was introduced.
diff --git a/libsylph/imap.c b/libsylph/imap.c
index 2d25950c..45c345ac 100644
--- a/libsylph/imap.c
+++ b/libsylph/imap.c
@@ -2741,8 +2741,6 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
 	g_return_val_if_fail(FOLDER_TYPE(item->folder) == F_IMAP, NULL);
 	g_return_val_if_fail(first_uid <= last_uid, NULL);
 
-	g_print("enter imap_get_uncached_messages\n");
-
 	if (first_uid == 0 && last_uid == 0)
 		strcpy(seq_set, "1:*");
 	else
@@ -2762,7 +2760,6 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
 #endif
 
 	progress_show(0, 0);
-	g_print("leave imap_get_uncached_messages\n");
 	return get_data.newlist;
 }
 
@@ -4056,7 +4053,6 @@ static gint imap_cmd_fetch(IMAPSession *session, guint32 uid,
 
 	g_return_val_if_fail(filename != NULL, IMAP_ERROR);
 
-	g_print("enter imap_cmd_fetch\n");
 	ok = imap_cmd_gen_send(session, "UID FETCH %u BODY.PEEK[]", uid);
 	if (ok != IMAP_SUCCESS)
 		return ok;
@@ -4067,7 +4063,6 @@ static gint imap_cmd_fetch(IMAPSession *session, guint32 uid,
 	ok = imap_cmd_fetch_func(session, &fetch_data);
 #endif
 
-	g_print("leave imap_cmd_fetch\n");
 	return ok;
 }
 
@@ -4317,10 +4312,7 @@ static gint imap_cmd_ok_func(IMAPSession *session, gpointer data)
 	GPtrArray *argbuf = (GPtrArray *)data;
 	gint ok;
 
-	g_print("enter imap_cmd_ok_func\n");
 	ok = imap_cmd_ok_real(session, argbuf);
-
-	g_print("leave imap_cmd_ok_func\n");
 	return ok;
 }
 #endif
diff --git a/libsylph/libsylph-0.def b/libsylph/libsylph-0.def
index 64f93621..c57d4f9e 100644
--- a/libsylph/libsylph-0.def
+++ b/libsylph/libsylph-0.def
@@ -18,651 +18,654 @@ EXPORTS
 	account_list_free @ 16
 	account_read_config_all @ 17
 	account_set_as_default @ 18
-	account_updated @ 19
-	account_write_config_all @ 20
-	add_history @ 21
-	address_equal @ 22
-	address_list_append @ 23
-	address_list_append_orig @ 24
-	address_table @ 25 DATA
-	base64_decode @ 26
-	base64_decoder_decode @ 27
-	base64_decoder_free @ 28
-	base64_decoder_new @ 29
-	base64_encode @ 30
-	canonicalize_file @ 31
-	canonicalize_file_replace @ 32
-	canonicalize_file_stream @ 33
-	canonicalize_str @ 34
-	change_dir @ 35
-	change_file_mode_rw @ 36
-	check_line_length @ 37
-	close_log_file @ 38
-	conv_check_file_encoding @ 39
-	conv_code_converter_destroy @ 40
-	conv_code_converter_new @ 41
-	conv_codeset_strdup_full @ 42
-	conv_convert @ 43
-	conv_copy_dir @ 44
-	conv_copy_file @ 45
-	conv_encode_filename @ 46
-	conv_encode_header @ 47
-	conv_filename_from_utf8 @ 48
-	conv_filename_to_utf8 @ 49
-	conv_get_autodetect_type @ 50
-	conv_get_charset_from_str @ 51
-	conv_get_charset_str @ 52
-	conv_get_code_conv_func @ 53
-	conv_get_current_locale @ 54
-	conv_get_internal_charset @ 55
-	conv_get_internal_charset_str @ 56
-	conv_get_locale_charset @ 57
-	conv_get_locale_charset_str @ 58
-	conv_get_outgoing_charset @ 59
-	conv_get_outgoing_charset_str @ 60
-	conv_guess_ja_encoding @ 61
-	conv_iconv_strdup @ 62
-	conv_iconv_strdup_with_cd @ 63
-	conv_is_ja_locale @ 64
-	conv_is_multibyte_encoding @ 65
-	conv_localetodisp @ 66
-	conv_mb_alnum @ 67
-	conv_set_autodetect_type @ 68
-	conv_unmime_header @ 69
-	conv_utf8todisp @ 70
-	copy_dir @ 71
-	copy_file @ 72
-	copy_file_part @ 73
-	copy_mbox @ 74
-	cur_account @ 75 DATA
-	custom_header_find @ 76
-	custom_header_free @ 77
-	custom_header_get_str @ 78
-	custom_header_read_config @ 79
-	custom_header_read_str @ 80
-	custom_header_write_config @ 81
-	debug_print @ 82
-	decode_uri @ 83
-	decode_xdigit_encoded_str @ 84
-	dirent_is_directory @ 85
-	dirent_is_regular_file @ 86
-	display_header_prop_free @ 87
-	display_header_prop_get_str @ 88
-	display_header_prop_read_str @ 89
-	eliminate_address_comment @ 90
-	eliminate_parenthesis @ 91
-	eliminate_quote @ 92
-	empty_mbox @ 93
-	encode_uri @ 94
-	event_loop_iterate @ 95
-	execute_async @ 96
-	execute_command_line @ 97
-	execute_command_line_async_wait @ 98
-	execute_open_file @ 99
-	execute_print_file @ 100
-	execute_sync @ 101
-	export_to_mbox @ 102
-	extract_address @ 103
-	extract_list_id_str @ 104
-	extract_parenthesis @ 105
-	extract_parenthesis_with_escape @ 106
-	extract_parenthesis_with_skip_quote @ 107
-	extract_quote @ 108
-	extract_quote_with_escape @ 109
-	fd_accept @ 110
-	fd_close @ 111
-	fd_connect_inet @ 112
-	fd_connect_unix @ 113
-	fd_getline @ 114
-	fd_gets @ 115
-	fd_open_inet @ 116
-	fd_open_unix @ 117
-	fd_read @ 118
-	fd_recv @ 119
-	fd_write @ 120
-	fd_write_all @ 121
-	file_exist @ 122
-	file_read_stream_to_str @ 123
-	file_read_to_str @ 124
-	filter_action_exec @ 125
-	filter_action_list_free @ 126
-	filter_action_new @ 127
-	filter_apply @ 128
-	filter_apply_msginfo @ 129
-	filter_cond_list_free @ 130
-	filter_cond_new @ 131
-	filter_get_keyword_from_msg @ 132
-	filter_get_str @ 133
-	filter_info_free @ 134
-	filter_info_new @ 135
-	filter_list_delete_path @ 136
-	filter_list_rename_path @ 137
-	filter_match_rule @ 138
-	filter_read_config @ 139
-	filter_read_file @ 140
-	filter_read_str @ 141
-	filter_rule_delete_action_by_dest_path @ 142
-	filter_rule_free @ 143
-	filter_rule_list_free @ 144
-	filter_rule_match_type_str_to_enum @ 145
-	filter_rule_new @ 146
-	filter_rule_rename_dest_path @ 147
-	filter_rule_requires_full_headers @ 148
-	filter_write_config @ 149
-	filter_write_file @ 150
-	filter_xml_node_to_filter_list @ 151
-	folder_add @ 152
-	folder_create_tree @ 153
-	folder_destroy @ 154
-	folder_find_child_item_by_name @ 155
-	folder_find_from_name @ 156
-	folder_find_from_path @ 157
-	folder_find_item_and_num_from_id @ 158
-	folder_find_item_from_identifier @ 159
-	folder_find_item_from_path @ 160
-	folder_get_default_draft @ 161
-	folder_get_default_folder @ 162
-	folder_get_default_inbox @ 163
-	folder_get_default_outbox @ 164
-	folder_get_default_queue @ 165
-	folder_get_default_trash @ 166
-	folder_get_identifier @ 167
-	folder_get_list @ 168
-	folder_get_path @ 169
-	folder_get_status @ 170
-	folder_item_add_msg @ 171
-	folder_item_add_msg_msginfo @ 172
-	folder_item_add_msgs @ 173
-	folder_item_add_msgs_msginfo @ 174
-	folder_item_append @ 175
-	folder_item_close @ 176
-	folder_item_compare @ 177
-	folder_item_copy @ 178
-	folder_item_copy_msg @ 179
-	folder_item_copy_msgs @ 180
-	folder_item_destroy @ 181
-	folder_item_fetch_all_msg @ 182
-	folder_item_fetch_msg @ 183
-	folder_item_get_cache_file @ 184
-	folder_item_get_identifier @ 185
-	folder_item_get_mark_file @ 186
-	folder_item_get_msg_list @ 187
-	folder_item_get_msginfo @ 188
-	folder_item_get_path @ 189
-	folder_item_get_uncached_msg_list @ 190
-	folder_item_is_msg_changed @ 191
-	folder_item_move_msg @ 192
-	folder_item_move_msgs @ 193
-	folder_item_new @ 194
-	folder_item_remove @ 195
-	folder_item_remove_all_msg @ 196
-	folder_item_remove_children @ 197
-	folder_item_remove_msg @ 198
-	folder_item_remove_msgs @ 199
-	folder_item_scan @ 200
-	folder_item_scan_foreach @ 201
-	folder_local_folder_destroy @ 202
-	folder_local_folder_init @ 203
-	folder_new @ 204
-	folder_read_list @ 205
-	folder_remote_folder_destroy @ 206
-	folder_remote_folder_init @ 207
-	folder_scan_tree @ 208
-	folder_set_missing_folders @ 209
-	folder_set_name @ 210
-	folder_set_ui_func @ 211
-	folder_tree_destroy @ 212
-	folder_unref_account_all @ 213
-	folder_write_list @ 214
-	fromuutobits @ 215
-	generate_mime_boundary @ 216
-	get_abbrev_newsgroup_name @ 217
-	get_alt_filename @ 218
-	get_command_output @ 219
-	get_debug_mode @ 220
-	get_document_dir @ 221
-	get_domain_name @ 222
-	get_file_size @ 223
-	get_file_size_as_crlf @ 224
-	get_home_dir @ 225
-	get_imap_cache_dir @ 226
-	get_left_file_size @ 227
-	get_mail_base_dir @ 228
-	get_mime_tmp_dir @ 229
-	get_news_cache_dir @ 230
-	get_next_word_len @ 231
-	get_old_rc_dir @ 232
-	get_outgoing_rfc2822_file @ 233
-	get_outgoing_rfc2822_str @ 234
-	get_quote_level @ 235
-	get_rc_dir @ 236
-	get_rfc822_date @ 237
-	get_startup_dir @ 238
-	get_template_dir @ 239
-	get_tmp_dir @ 240
-	get_tmp_file @ 241
-	get_uri_len @ 242
-	get_uri_path @ 243
-	hash_free_strings @ 244
-	hash_free_value_mem @ 245
-	html_parse @ 246
-	html_parser_destroy @ 247
-	html_parser_new @ 248
-	imap_get_class @ 249
-	imap_msg_list_set_perm_flags @ 250
-	imap_msg_list_unset_perm_flags @ 251
-	imap_msg_set_perm_flags @ 252
-	imap_msg_unset_perm_flags @ 253
-	input_query_password @ 254
-	is_ascii_str @ 255
-	is_dir_exist @ 256
-	is_file_entry_exist @ 257
-	is_header_line @ 258
-	is_next_nonascii @ 259
-	is_uri_string @ 260
-	itos @ 261
-	itos_buf @ 262
-	list_free_strings @ 263
-	lock_mbox @ 264
-	log_error @ 265
-	log_flush @ 266
-	log_message @ 267
-	log_print @ 268
-	log_warning @ 269
-	log_write @ 270
-	make_dir @ 271
-	make_dir_hier @ 272
-	md5_hex_hmac @ 273
-	md5_hmac @ 274
-	mh_get_class @ 275
-	move_file @ 276
-	my_gethostbyname @ 277
-	my_memmem @ 278
-	my_strftime @ 279
-	my_tmpfile @ 280
-	news_get_class @ 281
-	news_get_group_list @ 282
-	news_group_list_free @ 283
-	news_post @ 284
-	news_post_stream @ 285
-	news_remove_group_list_cache @ 286
-	newsgroup_list_append @ 287
-	nntp_article @ 288
-	nntp_body @ 289
-	nntp_get_article @ 290
-	nntp_group @ 291
-	nntp_head @ 292
-	nntp_list @ 293
-	nntp_mode @ 294
-	nntp_newgroups @ 295
-	nntp_newnews @ 296
-	nntp_next @ 297
-	nntp_post @ 298
-	nntp_session_new @ 299
-	nntp_stat @ 300
-	nntp_xhdr @ 301
-	nntp_xover @ 302
-	normalize_address_field @ 303
-	normalize_newlines @ 304
-	open_uri @ 305
-	path_cmp @ 306
-	pop3_delete_recv @ 307
-	pop3_delete_send @ 308
-	pop3_gen_send @ 309
-	pop3_get_uidl_table @ 310
-	pop3_getauth_apop_send @ 311
-	pop3_getauth_pass_send @ 312
-	pop3_getauth_user_send @ 313
-	pop3_getrange_last_recv @ 314
-	pop3_getrange_last_send @ 315
-	pop3_getrange_stat_recv @ 316
-	pop3_getrange_stat_send @ 317
-	pop3_getrange_uidl_recv @ 318
-	pop3_getrange_uidl_send @ 319
-	pop3_getsize_list_recv @ 320
-	pop3_getsize_list_send @ 321
-	pop3_greeting_recv @ 322
-	pop3_logout_send @ 323
-	pop3_ok @ 324
-	pop3_retr_recv @ 325
-	pop3_retr_send @ 326
-	pop3_session_new @ 327
-	pop3_stls_recv @ 328
-	pop3_stls_send @ 329
-	pop3_write_msg_to_file @ 330
-	pop3_write_uidl_list @ 331
-	prefs_account_apply_tmp_prefs @ 332
-	prefs_account_free @ 333
-	prefs_account_get_params @ 334
-	prefs_account_get_tmp_prefs @ 335
-	prefs_account_new @ 336
-	prefs_account_read_config @ 337
-	prefs_account_set_tmp_prefs @ 338
-	prefs_account_write_config_all @ 339
-	prefs_common @ 340 DATA
-	prefs_common_get @ 341
-	prefs_common_get_params @ 342
-	prefs_common_junk_filter_list_set @ 343
-	prefs_common_junk_folder_rename_path @ 344
-	prefs_common_read_config @ 345
-	prefs_common_write_config @ 346
-	prefs_file_close @ 347
-	prefs_file_close_revert @ 348
-	prefs_file_get_backup_generation @ 349
-	prefs_file_open @ 350
-	prefs_file_set_backup_generation @ 351
-	prefs_file_write_param @ 352
-	prefs_free @ 353
-	prefs_param_table_destroy @ 354
-	prefs_param_table_get @ 355
-	prefs_read_config @ 356
-	prefs_set_default @ 357
-	prefs_write_config @ 358
-	proc_mbox @ 359
-	proc_mbox_full @ 360
-	procheader_add_header_list @ 361
-	procheader_copy_header_list @ 362
-	procheader_date_get_localtime @ 363
-	procheader_date_parse @ 364
-	procheader_find_header_list @ 365
-	procheader_get_fromname @ 366
-	procheader_get_header_array @ 367
-	procheader_get_header_array_asis @ 368
-	procheader_get_header_array_for_display @ 369
-	procheader_get_header_fields @ 370
-	procheader_get_header_list @ 371
-	procheader_get_header_list_from_file @ 372
-	procheader_get_header_list_from_msginfo @ 373
-	procheader_get_one_field @ 374
-	procheader_get_toname @ 375
-	procheader_get_unfolded_line @ 376
-	procheader_header_array_destroy @ 377
-	procheader_header_free @ 378
-	procheader_header_list_destroy @ 379
-	procheader_merge_header_list @ 380
-	procheader_merge_header_list_dup @ 381
-	procheader_parse_file @ 382
-	procheader_parse_str @ 383
-	procheader_parse_stream @ 384
-	procmime_decode_content @ 385
-	procmime_execute_open_file @ 386
-	procmime_find_string @ 387
-	procmime_find_string_part @ 388
-	procmime_get_all_parts @ 389
-	procmime_get_encoding_for_charset @ 390
-	procmime_get_encoding_for_str @ 391
-	procmime_get_encoding_for_text_file @ 392
-	procmime_get_encoding_str @ 393
-	procmime_get_first_text_content @ 394
-	procmime_get_mime_type @ 395
-	procmime_get_part @ 396
-	procmime_get_part_file_name @ 397
-	procmime_get_part_fp @ 398
-	procmime_get_text_content @ 399
-	procmime_get_tmp_file_name @ 400
-	procmime_mimeinfo_free_all @ 401
-	procmime_mimeinfo_insert @ 402
-	procmime_mimeinfo_new @ 403
-	procmime_mimeinfo_next @ 404
-	procmime_scan_content_disposition @ 405
-	procmime_scan_content_type @ 406
-	procmime_scan_content_type_str @ 407
-	procmime_scan_encoding @ 408
-	procmime_scan_message @ 409
-	procmime_scan_mime_header @ 410
-	procmime_scan_mime_type @ 411
-	procmime_scan_multipart_message @ 412
-	procmsg_add_cache_queue @ 413
-	procmsg_add_flags @ 414
-	procmsg_add_mark_queue @ 415
-	procmsg_clear_cache @ 416
-	procmsg_clear_mark @ 417
-	procmsg_cmp_msgnum_for_sort @ 418
-	procmsg_copy_messages @ 419
-	procmsg_empty_all_trash @ 420
-	procmsg_empty_trash @ 421
-	procmsg_flush_cache_queue @ 422
-	procmsg_flush_folder @ 423
-	procmsg_flush_folder_foreach @ 424
-	procmsg_flush_mark_queue @ 425
-	procmsg_get_last_num_in_msg_list @ 426
-	procmsg_get_mark_sum @ 427
-	procmsg_get_message_file @ 428
-	procmsg_get_message_file_list @ 429
-	procmsg_get_message_file_path @ 430
-	procmsg_get_msginfo @ 431
-	procmsg_get_thread_date @ 432
-	procmsg_get_thread_tree @ 433
-	procmsg_mark_all_read @ 434
-	procmsg_message_file_list_free @ 435
-	procmsg_move_messages @ 436
-	procmsg_msg_exist @ 437
-	procmsg_msg_hash_table_append @ 438
-	procmsg_msg_hash_table_create @ 439
-	procmsg_msg_list_free @ 440
-	procmsg_msginfo_copy @ 441
-	procmsg_msginfo_equal @ 442
-	procmsg_msginfo_free @ 443
-	procmsg_msginfo_get_full_info @ 444
-	procmsg_open_cache_file @ 445
-	procmsg_open_data_file @ 446
-	procmsg_open_mark_file @ 447
-	procmsg_open_message @ 448
-	procmsg_open_message_decrypted @ 449
-	procmsg_print_message @ 450
-	procmsg_print_message_part @ 451
-	procmsg_read_cache @ 452
-	procmsg_read_cache_data_str @ 453
-	procmsg_remove_all_cached_messages @ 454
-	procmsg_save_to_outbox @ 455
-	procmsg_set_auto_decrypt_message @ 456
-	procmsg_set_decrypt_message_func @ 457
-	procmsg_set_flags @ 458
-	procmsg_sort_msg_list @ 459
-	procmsg_to_folder_hash_table_create @ 460
-	procmsg_trash_messages_exist @ 461
-	procmsg_write_cache @ 462
-	procmsg_write_cache_list @ 463
-	procmsg_write_flags @ 464
-	procmsg_write_flags_for_multiple_folders @ 465
-	procmsg_write_flags_list @ 466
-	progress_show @ 467
-	ptr_array_free_strings @ 468
-	qp_decode_line @ 469
-	qp_decode_q_encoding @ 470
-	qp_encode_line @ 471
-	qp_get_q_encoding_len @ 472
-	qp_q_encode @ 473
-	recv_bytes @ 474
-	recv_bytes_write @ 475
-	recv_bytes_write_to_file @ 476
-	recv_set_ui_func @ 477
-	recv_write @ 478
-	recv_write_to_file @ 479
-	references_list_append @ 480
-	references_list_prepend @ 481
-	remote_tzoffset_sec @ 482
-	remove_all_files @ 483
-	remove_all_numbered_files @ 484
-	remove_dir_recursive @ 485
-	remove_expired_files @ 486
-	remove_numbered_files @ 487
-	remove_return @ 488
-	remove_space @ 489
-	rename_force @ 490
-	s_gnet_md5_clone @ 491
-	s_gnet_md5_copy_string @ 492
-	s_gnet_md5_delete @ 493
-	s_gnet_md5_equal @ 494
-	s_gnet_md5_final @ 495
-	s_gnet_md5_get_digest @ 496
-	s_gnet_md5_get_string @ 497
-	s_gnet_md5_hash @ 498
-	s_gnet_md5_new @ 499
-	s_gnet_md5_new_incremental @ 500
-	s_gnet_md5_new_string @ 501
-	s_gnet_md5_update @ 502
-	scan_mailto_url @ 503
-	session_connect @ 504
-	session_destroy @ 505
-	session_disconnect @ 506
-	session_init @ 507
-	session_is_connected @ 508
-	session_recv_data @ 509
-	session_recv_data_as_file @ 510
-	session_recv_msg @ 511
-	session_send_data @ 512
-	session_send_msg @ 513
-	session_set_access_time @ 514
-	session_set_recv_data_notify @ 515
-	session_set_recv_data_progressive_notify @ 516
-	session_set_recv_message_notify @ 517
-	session_set_send_data_notify @ 518
-	session_set_send_data_progressive_notify @ 519
-	session_set_timeout @ 520
-	session_start_tls @ 521
-	set_debug_mode @ 522
-	set_event_loop_func @ 523
-	set_input_query_password_func @ 524
-	set_log_file @ 525
-	set_log_show_status_func @ 526
-	set_log_ui_func @ 527
-	set_log_ui_func_full @ 528
-	set_log_verbosity @ 529
-	set_progress_func @ 530
-	set_rc_dir @ 531
-	set_startup_dir @ 532
-	set_ui_update_func @ 533
-	sinfo_equal @ 534
-	sinfo_hash @ 535
-	slist_free_strings @ 536
-	smtp_session_new @ 537
-	sock_add_watch @ 538
-	sock_add_watch_poll @ 539
-	sock_cleanup @ 540
-	sock_close @ 541
-	sock_connect @ 542
-	sock_connect_async_thread @ 543
-	sock_connect_async_thread_wait @ 544
-	sock_getline @ 545
-	sock_gets @ 546
-	sock_has_read_data @ 547
-	sock_init @ 548
-	sock_is_nonblocking_mode @ 549
-	sock_peek @ 550
-	sock_printf @ 551
-	sock_puts @ 552
-	sock_read @ 553
-	sock_set_io_timeout @ 554
-	sock_set_nonblocking_mode @ 555
-	sock_watch_funcs @ 556 DATA
-	sock_write @ 557
-	sock_write_all @ 558
-	ssl_done @ 559
-	ssl_done_socket @ 560
-	ssl_getline @ 561
-	ssl_gets @ 562
-	ssl_init @ 563
-	ssl_init_socket @ 564
-	ssl_init_socket_with_method @ 565
-	ssl_peek @ 566
-	ssl_read @ 567
-	ssl_set_verify_func @ 568
-	ssl_write @ 569
-	ssl_write_all @ 570
-	status_print @ 571
-	str_case_equal @ 572
-	str_case_find @ 573
-	str_case_find_equal @ 574
-	str_case_hash @ 575
-	str_find @ 576
-	str_find_equal @ 577
-	str_find_format_times @ 578
-	str_has_suffix_case @ 579
-	str_open_as_stream @ 580
-	str_write_to_file @ 581
-	strcasestr @ 582
-	strchomp_all @ 583
-	strchr_parenthesis_close @ 584
-	strchr_with_skip_quote @ 585
-	strcmp2 @ 586
-	strcrchomp @ 587
-	string_table_free @ 588
-	string_table_free_string @ 589
-	string_table_get_stats @ 590
-	string_table_insert_string @ 591
-	string_table_lookup_string @ 592
-	string_table_new @ 593
-	strncpy2 @ 594
-	strrchr_with_skip_quote @ 595
-	strretchomp @ 596
-	strsplit_csv @ 597
-	strsplit_parenthesis @ 598
-	strsplit_with_quote @ 599
-	strstr_with_skip_quote @ 600
-	strtailchomp @ 601
-	subject_compare @ 602
-	subject_compare_for_sort @ 603
-	subst_char @ 604
-	subst_chars @ 605
-	subst_control @ 606
-	subst_for_filename @ 607
-	subst_null @ 608
-	syl_app_create @ 609
-	syl_app_get @ 610
-	syl_app_get_type @ 611
-	syl_cleanup @ 612
-	syl_init @ 613
-	syl_init_gettext @ 614
-	syl_link @ 615
-	syl_marshal_VOID__POINTER_STRING_STRING @ 616
-	syl_marshal_VOID__POINTER_STRING_UINT @ 617
-	syl_save_all_state @ 618
-	syl_setup_rc_dir @ 619
-	to_human_readable @ 620
-	to_number @ 621
-	touufrombits @ 622
-	trim_string @ 623
-	trim_string_before @ 624
-	trim_subject @ 625
-	trim_subject_for_compare @ 626
-	trim_subject_for_sort @ 627
-	tzoffset @ 628
-	tzoffset_buf @ 629
-	tzoffset_sec @ 630
-	ui_update @ 631
-	uncanonicalize_file @ 632
-	uncanonicalize_file_replace @ 633
-	unfold_line @ 634
-	unlock_mbox @ 635
-	unmime_header @ 636
-	uri_list_extract_filenames @ 637
-	uriencode_for_filename @ 638
-	uriencode_for_mailto @ 639
-	uudigit @ 640 DATA
-	virtual_get_class @ 641
-	xml_attr_new @ 642
-	xml_close_file @ 643
-	xml_compare_tag @ 644
-	xml_copy_attr @ 645
-	xml_copy_tag @ 646
-	xml_file_put_escape_str @ 647
-	xml_file_put_node @ 648
-	xml_file_put_xml_decl @ 649
-	xml_free_node @ 650
-	xml_free_tree @ 651
-	xml_get_current_tag @ 652
-	xml_get_current_tag_attr @ 653
-	xml_get_dtd @ 654
-	xml_get_element @ 655
-	xml_node_new @ 656
-	xml_open_file @ 657
-	xml_parse_file @ 658
-	xml_parse_next_tag @ 659
-	xml_pop_tag @ 660
-	xml_push_tag @ 661
-	xml_read_line @ 662
-	xml_tag_add_attr @ 663
-	xml_tag_new @ 664
-	xml_truncate_buf @ 665
-	xml_unescape_str @ 666
+	account_update_lock @ 19
+	account_update_unlock @ 20
+	account_updated @ 21
+	account_write_config_all @ 22
+	add_history @ 23
+	address_equal @ 24
+	address_list_append @ 25
+	address_list_append_orig @ 26
+	address_table @ 27 DATA
+	base64_decode @ 28
+	base64_decoder_decode @ 29
+	base64_decoder_free @ 30
+	base64_decoder_new @ 31
+	base64_encode @ 32
+	canonicalize_file @ 33
+	canonicalize_file_replace @ 34
+	canonicalize_file_stream @ 35
+	canonicalize_str @ 36
+	change_dir @ 37
+	change_file_mode_rw @ 38
+	check_line_length @ 39
+	close_log_file @ 40
+	conv_check_file_encoding @ 41
+	conv_code_converter_destroy @ 42
+	conv_code_converter_new @ 43
+	conv_codeset_strdup_full @ 44
+	conv_convert @ 45
+	conv_copy_dir @ 46
+	conv_copy_file @ 47
+	conv_encode_filename @ 48
+	conv_encode_header @ 49
+	conv_filename_from_utf8 @ 50
+	conv_filename_to_utf8 @ 51
+	conv_get_autodetect_type @ 52
+	conv_get_charset_from_str @ 53
+	conv_get_charset_str @ 54
+	conv_get_code_conv_func @ 55
+	conv_get_current_locale @ 56
+	conv_get_internal_charset @ 57
+	conv_get_internal_charset_str @ 58
+	conv_get_locale_charset @ 59
+	conv_get_locale_charset_str @ 60
+	conv_get_outgoing_charset @ 61
+	conv_get_outgoing_charset_str @ 62
+	conv_guess_ja_encoding @ 63
+	conv_iconv_strdup @ 64
+	conv_iconv_strdup_with_cd @ 65
+	conv_is_ja_locale @ 66
+	conv_is_multibyte_encoding @ 67
+	conv_localetodisp @ 68
+	conv_mb_alnum @ 69
+	conv_set_autodetect_type @ 70
+	conv_unmime_header @ 71
+	conv_utf8todisp @ 72
+	copy_dir @ 73
+	copy_file @ 74
+	copy_file_part @ 75
+	copy_mbox @ 76
+	cur_account @ 77 DATA
+	custom_header_find @ 78
+	custom_header_free @ 79
+	custom_header_get_str @ 80
+	custom_header_read_config @ 81
+	custom_header_read_str @ 82
+	custom_header_write_config @ 83
+	debug_print @ 84
+	decode_uri @ 85
+	decode_xdigit_encoded_str @ 86
+	dirent_is_directory @ 87
+	dirent_is_regular_file @ 88
+	display_header_prop_free @ 89
+	display_header_prop_get_str @ 90
+	display_header_prop_read_str @ 91
+	eliminate_address_comment @ 92
+	eliminate_parenthesis @ 93
+	eliminate_quote @ 94
+	empty_mbox @ 95
+	encode_uri @ 96
+	event_loop_iterate @ 97
+	execute_async @ 98
+	execute_command_line @ 99
+	execute_command_line_async_wait @ 100
+	execute_open_file @ 101
+	execute_print_file @ 102
+	execute_sync @ 103
+	export_to_mbox @ 104
+	extract_address @ 105
+	extract_list_id_str @ 106
+	extract_parenthesis @ 107
+	extract_parenthesis_with_escape @ 108
+	extract_parenthesis_with_skip_quote @ 109
+	extract_quote @ 110
+	extract_quote_with_escape @ 111
+	fd_accept @ 112
+	fd_close @ 113
+	fd_connect_inet @ 114
+	fd_connect_unix @ 115
+	fd_getline @ 116
+	fd_gets @ 117
+	fd_open_inet @ 118
+	fd_open_unix @ 119
+	fd_read @ 120
+	fd_recv @ 121
+	fd_write @ 122
+	fd_write_all @ 123
+	file_exist @ 124
+	file_read_stream_to_str @ 125
+	file_read_to_str @ 126
+	filter_action_exec @ 127
+	filter_action_list_free @ 128
+	filter_action_new @ 129
+	filter_apply @ 130
+	filter_apply_msginfo @ 131
+	filter_cond_list_free @ 132
+	filter_cond_new @ 133
+	filter_get_keyword_from_msg @ 134
+	filter_get_str @ 135
+	filter_info_free @ 136
+	filter_info_new @ 137
+	filter_list_delete_path @ 138
+	filter_list_rename_path @ 139
+	filter_match_rule @ 140
+	filter_read_config @ 141
+	filter_read_file @ 142
+	filter_read_str @ 143
+	filter_rule_delete_action_by_dest_path @ 144
+	filter_rule_free @ 145
+	filter_rule_list_free @ 146
+	filter_rule_match_type_str_to_enum @ 147
+	filter_rule_new @ 148
+	filter_rule_rename_dest_path @ 149
+	filter_rule_requires_full_headers @ 150
+	filter_write_config @ 151
+	filter_write_file @ 152
+	filter_xml_node_to_filter_list @ 153
+	folder_add @ 154
+	folder_create_tree @ 155
+	folder_destroy @ 156
+	folder_find_child_item_by_name @ 157
+	folder_find_from_name @ 158
+	folder_find_from_path @ 159
+	folder_find_item_and_num_from_id @ 160
+	folder_find_item_from_identifier @ 161
+	folder_find_item_from_path @ 162
+	folder_get_default_draft @ 163
+	folder_get_default_folder @ 164
+	folder_get_default_inbox @ 165
+	folder_get_default_outbox @ 166
+	folder_get_default_queue @ 167
+	folder_get_default_trash @ 168
+	folder_get_identifier @ 169
+	folder_get_list @ 170
+	folder_get_path @ 171
+	folder_get_status @ 172
+	folder_item_add_msg @ 173
+	folder_item_add_msg_msginfo @ 174
+	folder_item_add_msgs @ 175
+	folder_item_add_msgs_msginfo @ 176
+	folder_item_append @ 177
+	folder_item_close @ 178
+	folder_item_compare @ 179
+	folder_item_copy @ 180
+	folder_item_copy_msg @ 181
+	folder_item_copy_msgs @ 182
+	folder_item_destroy @ 183
+	folder_item_fetch_all_msg @ 184
+	folder_item_fetch_msg @ 185
+	folder_item_get_cache_file @ 186
+	folder_item_get_identifier @ 187
+	folder_item_get_mark_file @ 188
+	folder_item_get_msg_list @ 189
+	folder_item_get_msginfo @ 190
+	folder_item_get_path @ 191
+	folder_item_get_uncached_msg_list @ 192
+	folder_item_is_msg_changed @ 193
+	folder_item_move_msg @ 194
+	folder_item_move_msgs @ 195
+	folder_item_new @ 196
+	folder_item_remove @ 197
+	folder_item_remove_all_msg @ 198
+	folder_item_remove_children @ 199
+	folder_item_remove_msg @ 200
+	folder_item_remove_msgs @ 201
+	folder_item_scan @ 202
+	folder_item_scan_foreach @ 203
+	folder_local_folder_destroy @ 204
+	folder_local_folder_init @ 205
+	folder_new @ 206
+	folder_read_list @ 207
+	folder_remote_folder_destroy @ 208
+	folder_remote_folder_init @ 209
+	folder_scan_tree @ 210
+	folder_set_missing_folders @ 211
+	folder_set_name @ 212
+	folder_set_ui_func @ 213
+	folder_tree_destroy @ 214
+	folder_unref_account_all @ 215
+	folder_write_list @ 216
+	fromuutobits @ 217
+	generate_mime_boundary @ 218
+	get_abbrev_newsgroup_name @ 219
+	get_alt_filename @ 220
+	get_command_output @ 221
+	get_debug_mode @ 222
+	get_document_dir @ 223
+	get_domain_name @ 224
+	get_file_size @ 225
+	get_file_size_as_crlf @ 226
+	get_home_dir @ 227
+	get_imap_cache_dir @ 228
+	get_left_file_size @ 229
+	get_mail_base_dir @ 230
+	get_mime_tmp_dir @ 231
+	get_news_cache_dir @ 232
+	get_next_word_len @ 233
+	get_old_rc_dir @ 234
+	get_outgoing_rfc2822_file @ 235
+	get_outgoing_rfc2822_str @ 236
+	get_quote_level @ 237
+	get_rc_dir @ 238
+	get_rfc822_date @ 239
+	get_startup_dir @ 240
+	get_template_dir @ 241
+	get_tmp_dir @ 242
+	get_tmp_file @ 243
+	get_uri_len @ 244
+	get_uri_path @ 245
+	hash_free_strings @ 246
+	hash_free_value_mem @ 247
+	html_parse @ 248
+	html_parser_destroy @ 249
+	html_parser_new @ 250
+	imap_get_class @ 251
+	imap_msg_list_set_perm_flags @ 252
+	imap_msg_list_unset_perm_flags @ 253
+	imap_msg_set_perm_flags @ 254
+	imap_msg_unset_perm_flags @ 255
+	input_query_password @ 256
+	is_ascii_str @ 257
+	is_dir_exist @ 258
+	is_file_entry_exist @ 259
+	is_header_line @ 260
+	is_next_nonascii @ 261
+	is_uri_string @ 262
+	itos @ 263
+	itos_buf @ 264
+	list_free_strings @ 265
+	lock_mbox @ 266
+	log_error @ 267
+	log_flush @ 268
+	log_message @ 269
+	log_print @ 270
+	log_warning @ 271
+	log_write @ 272
+	make_dir @ 273
+	make_dir_hier @ 274
+	md5_hex_hmac @ 275
+	md5_hmac @ 276
+	mh_get_class @ 277
+	move_file @ 278
+	my_gethostbyname @ 279
+	my_memmem @ 280
+	my_strftime @ 281
+	my_tmpfile @ 282
+	news_get_class @ 283
+	news_get_group_list @ 284
+	news_group_list_free @ 285
+	news_post @ 286
+	news_post_stream @ 287
+	news_remove_group_list_cache @ 288
+	newsgroup_list_append @ 289
+	nntp_article @ 290
+	nntp_body @ 291
+	nntp_get_article @ 292
+	nntp_group @ 293
+	nntp_head @ 294
+	nntp_list @ 295
+	nntp_mode @ 296
+	nntp_newgroups @ 297
+	nntp_newnews @ 298
+	nntp_next @ 299
+	nntp_post @ 300
+	nntp_session_new @ 301
+	nntp_stat @ 302
+	nntp_xhdr @ 303
+	nntp_xover @ 304
+	normalize_address_field @ 305
+	normalize_newlines @ 306
+	open_uri @ 307
+	path_cmp @ 308
+	pop3_delete_recv @ 309
+	pop3_delete_send @ 310
+	pop3_gen_send @ 311
+	pop3_get_uidl_table @ 312
+	pop3_getauth_apop_send @ 313
+	pop3_getauth_pass_send @ 314
+	pop3_getauth_user_send @ 315
+	pop3_getrange_last_recv @ 316
+	pop3_getrange_last_send @ 317
+	pop3_getrange_stat_recv @ 318
+	pop3_getrange_stat_send @ 319
+	pop3_getrange_uidl_recv @ 320
+	pop3_getrange_uidl_send @ 321
+	pop3_getsize_list_recv @ 322
+	pop3_getsize_list_send @ 323
+	pop3_greeting_recv @ 324
+	pop3_logout_send @ 325
+	pop3_ok @ 326
+	pop3_retr_recv @ 327
+	pop3_retr_send @ 328
+	pop3_session_new @ 329
+	pop3_stls_recv @ 330
+	pop3_stls_send @ 331
+	pop3_write_msg_to_file @ 332
+	pop3_write_uidl_list @ 333
+	prefs_account_apply_tmp_prefs @ 334
+	prefs_account_free @ 335
+	prefs_account_get_params @ 336
+	prefs_account_get_tmp_prefs @ 337
+	prefs_account_new @ 338
+	prefs_account_read_config @ 339
+	prefs_account_set_tmp_prefs @ 340
+	prefs_account_write_config_all @ 341
+	prefs_common @ 342 DATA
+	prefs_common_get @ 343
+	prefs_common_get_params @ 344
+	prefs_common_junk_filter_list_set @ 345
+	prefs_common_junk_folder_rename_path @ 346
+	prefs_common_read_config @ 347
+	prefs_common_write_config @ 348
+	prefs_file_close @ 349
+	prefs_file_close_revert @ 350
+	prefs_file_get_backup_generation @ 351
+	prefs_file_open @ 352
+	prefs_file_set_backup_generation @ 353
+	prefs_file_write_param @ 354
+	prefs_free @ 355
+	prefs_param_table_destroy @ 356
+	prefs_param_table_get @ 357
+	prefs_read_config @ 358
+	prefs_set_default @ 359
+	prefs_write_config @ 360
+	proc_mbox @ 361
+	proc_mbox_full @ 362
+	procheader_add_header_list @ 363
+	procheader_copy_header_list @ 364
+	procheader_date_get_localtime @ 365
+	procheader_date_parse @ 366
+	procheader_find_header_list @ 367
+	procheader_get_fromname @ 368
+	procheader_get_header_array @ 369
+	procheader_get_header_array_asis @ 370
+	procheader_get_header_array_for_display @ 371
+	procheader_get_header_fields @ 372
+	procheader_get_header_list @ 373
+	procheader_get_header_list_from_file @ 374
+	procheader_get_header_list_from_msginfo @ 375
+	procheader_get_one_field @ 376
+	procheader_get_toname @ 377
+	procheader_get_unfolded_line @ 378
+	procheader_header_array_destroy @ 379
+	procheader_header_free @ 380
+	procheader_header_list_destroy @ 381
+	procheader_merge_header_list @ 382
+	procheader_merge_header_list_dup @ 383
+	procheader_parse_file @ 384
+	procheader_parse_str @ 385
+	procheader_parse_stream @ 386
+	procmime_decode_content @ 387
+	procmime_execute_open_file @ 388
+	procmime_find_string @ 389
+	procmime_find_string_part @ 390
+	procmime_get_all_parts @ 391
+	procmime_get_encoding_for_charset @ 392
+	procmime_get_encoding_for_str @ 393
+	procmime_get_encoding_for_text_file @ 394
+	procmime_get_encoding_str @ 395
+	procmime_get_first_text_content @ 396
+	procmime_get_mime_type @ 397
+	procmime_get_part @ 398
+	procmime_get_part_file_name @ 399
+	procmime_get_part_fp @ 400
+	procmime_get_text_content @ 401
+	procmime_get_tmp_file_name @ 402
+	procmime_mimeinfo_free_all @ 403
+	procmime_mimeinfo_insert @ 404
+	procmime_mimeinfo_new @ 405
+	procmime_mimeinfo_next @ 406
+	procmime_scan_content_disposition @ 407
+	procmime_scan_content_type @ 408
+	procmime_scan_content_type_str @ 409
+	procmime_scan_encoding @ 410
+	procmime_scan_message @ 411
+	procmime_scan_mime_header @ 412
+	procmime_scan_mime_type @ 413
+	procmime_scan_multipart_message @ 414
+	procmsg_add_cache_queue @ 415
+	procmsg_add_flags @ 416
+	procmsg_add_mark_queue @ 417
+	procmsg_clear_cache @ 418
+	procmsg_clear_mark @ 419
+	procmsg_cmp_msgnum_for_sort @ 420
+	procmsg_copy_messages @ 421
+	procmsg_empty_all_trash @ 422
+	procmsg_empty_trash @ 423
+	procmsg_flush_cache_queue @ 424
+	procmsg_flush_folder @ 425
+	procmsg_flush_folder_foreach @ 426
+	procmsg_flush_mark_queue @ 427
+	procmsg_get_last_num_in_msg_list @ 428
+	procmsg_get_mark_sum @ 429
+	procmsg_get_message_file @ 430
+	procmsg_get_message_file_list @ 431
+	procmsg_get_message_file_path @ 432
+	procmsg_get_msginfo @ 433
+	procmsg_get_thread_date @ 434
+	procmsg_get_thread_tree @ 435
+	procmsg_mark_all_read @ 436
+	procmsg_message_file_list_free @ 437
+	procmsg_move_messages @ 438
+	procmsg_msg_exist @ 439
+	procmsg_msg_hash_table_append @ 440
+	procmsg_msg_hash_table_create @ 441
+	procmsg_msg_list_free @ 442
+	procmsg_msginfo_copy @ 443
+	procmsg_msginfo_equal @ 444
+	procmsg_msginfo_free @ 445
+	procmsg_msginfo_get_full_info @ 446
+	procmsg_open_cache_file @ 447
+	procmsg_open_data_file @ 448
+	procmsg_open_mark_file @ 449
+	procmsg_open_message @ 450
+	procmsg_open_message_decrypted @ 451
+	procmsg_print_message @ 452
+	procmsg_print_message_part @ 453
+	procmsg_read_cache @ 454
+	procmsg_read_cache_data_str @ 455
+	procmsg_remove_all_cached_messages @ 456
+	procmsg_save_to_outbox @ 457
+	procmsg_set_auto_decrypt_message @ 458
+	procmsg_set_decrypt_message_func @ 459
+	procmsg_set_flags @ 460
+	procmsg_sort_msg_list @ 461
+	procmsg_to_folder_hash_table_create @ 462
+	procmsg_trash_messages_exist @ 463
+	procmsg_write_cache @ 464
+	procmsg_write_cache_list @ 465
+	procmsg_write_flags @ 466
+	procmsg_write_flags_for_multiple_folders @ 467
+	procmsg_write_flags_list @ 468
+	progress_show @ 469
+	ptr_array_free_strings @ 470
+	qp_decode_line @ 471
+	qp_decode_q_encoding @ 472
+	qp_encode_line @ 473
+	qp_get_q_encoding_len @ 474
+	qp_q_encode @ 475
+	recv_bytes @ 476
+	recv_bytes_write @ 477
+	recv_bytes_write_to_file @ 478
+	recv_set_ui_func @ 479
+	recv_write @ 480
+	recv_write_to_file @ 481
+	references_list_append @ 482
+	references_list_prepend @ 483
+	remote_tzoffset_sec @ 484
+	remove_all_files @ 485
+	remove_all_numbered_files @ 486
+	remove_dir_recursive @ 487
+	remove_expired_files @ 488
+	remove_numbered_files @ 489
+	remove_return @ 490
+	remove_space @ 491
+	rename_force @ 492
+	s_gnet_md5_clone @ 493
+	s_gnet_md5_copy_string @ 494
+	s_gnet_md5_delete @ 495
+	s_gnet_md5_equal @ 496
+	s_gnet_md5_final @ 497
+	s_gnet_md5_get_digest @ 498
+	s_gnet_md5_get_string @ 499
+	s_gnet_md5_hash @ 500
+	s_gnet_md5_new @ 501
+	s_gnet_md5_new_incremental @ 502
+	s_gnet_md5_new_string @ 503
+	s_gnet_md5_update @ 504
+	scan_mailto_url @ 505
+	session_connect @ 506
+	session_destroy @ 507
+	session_disconnect @ 508
+	session_init @ 509
+	session_is_connected @ 510
+	session_recv_data @ 511
+	session_recv_data_as_file @ 512
+	session_recv_msg @ 513
+	session_send_data @ 514
+	session_send_msg @ 515
+	session_set_access_time @ 516
+	session_set_recv_data_notify @ 517
+	session_set_recv_data_progressive_notify @ 518
+	session_set_recv_message_notify @ 519
+	session_set_send_data_notify @ 520
+	session_set_send_data_progressive_notify @ 521
+	session_set_timeout @ 522
+	session_start_tls @ 523
+	set_debug_mode @ 524
+	set_event_loop_func @ 525
+	set_input_query_password_func @ 526
+	set_log_file @ 527
+	set_log_show_status_func @ 528
+	set_log_ui_func @ 529
+	set_log_ui_func_full @ 530
+	set_log_verbosity @ 531
+	set_progress_func @ 532
+	set_rc_dir @ 533
+	set_startup_dir @ 534
+	set_ui_update_func @ 535
+	sinfo_equal @ 536
+	sinfo_hash @ 537
+	slist_free_strings @ 538
+	smtp_session_new @ 539
+	sock_add_watch @ 540
+	sock_add_watch_poll @ 541
+	sock_cleanup @ 542
+	sock_close @ 543
+	sock_connect @ 544
+	sock_connect_async_thread @ 545
+	sock_connect_async_thread_wait @ 546
+	sock_getline @ 547
+	sock_gets @ 548
+	sock_has_read_data @ 549
+	sock_init @ 550
+	sock_is_nonblocking_mode @ 551
+	sock_peek @ 552
+	sock_printf @ 553
+	sock_puts @ 554
+	sock_read @ 555
+	sock_set_io_timeout @ 556
+	sock_set_nonblocking_mode @ 557
+	sock_watch_funcs @ 558 DATA
+	sock_write @ 559
+	sock_write_all @ 560
+	ssl_done @ 561
+	ssl_done_socket @ 562
+	ssl_getline @ 563
+	ssl_gets @ 564
+	ssl_init @ 565
+	ssl_init_socket @ 566
+	ssl_init_socket_with_method @ 567
+	ssl_peek @ 568
+	ssl_read @ 569
+	ssl_set_verify_func @ 570
+	ssl_write @ 571
+	ssl_write_all @ 572
+	status_print @ 573
+	str_case_equal @ 574
+	str_case_find @ 575
+	str_case_find_equal @ 576
+	str_case_hash @ 577
+	str_find @ 578
+	str_find_equal @ 579
+	str_find_format_times @ 580
+	str_has_suffix_case @ 581
+	str_open_as_stream @ 582
+	str_write_to_file @ 583
+	strcasestr @ 584
+	strchomp_all @ 585
+	strchr_parenthesis_close @ 586
+	strchr_with_skip_quote @ 587
+	strcmp2 @ 588
+	strcrchomp @ 589
+	string_table_free @ 590
+	string_table_free_string @ 591
+	string_table_get_stats @ 592
+	string_table_insert_string @ 593
+	string_table_lookup_string @ 594
+	string_table_new @ 595
+	strncpy2 @ 596
+	strrchr_with_skip_quote @ 597
+	strretchomp @ 598
+	strsplit_csv @ 599
+	strsplit_parenthesis @ 600
+	strsplit_with_quote @ 601
+	strstr_with_skip_quote @ 602
+	strtailchomp @ 603
+	subject_compare @ 604
+	subject_compare_for_sort @ 605
+	subst_char @ 606
+	subst_chars @ 607
+	subst_control @ 608
+	subst_for_filename @ 609
+	subst_null @ 610
+	syl_app_create @ 611
+	syl_app_get @ 612
+	syl_app_get_type @ 613
+	syl_cleanup @ 614
+	syl_init @ 615
+	syl_init_gettext @ 616
+	syl_link @ 617
+	syl_marshal_VOID__POINTER_STRING_STRING @ 618
+	syl_marshal_VOID__POINTER_STRING_UINT @ 619
+	syl_save_all_state @ 620
+	syl_setup_rc_dir @ 621
+	to_human_readable @ 622
+	to_number @ 623
+	touufrombits @ 624
+	trim_string @ 625
+	trim_string_before @ 626
+	trim_subject @ 627
+	trim_subject_for_compare @ 628
+	trim_subject_for_sort @ 629
+	tzoffset @ 630
+	tzoffset_buf @ 631
+	tzoffset_sec @ 632
+	ui_update @ 633
+	uncanonicalize_file @ 634
+	uncanonicalize_file_replace @ 635
+	unfold_line @ 636
+	unlock_mbox @ 637
+	unmime_header @ 638
+	uri_list_extract_filenames @ 639
+	uriencode_for_filename @ 640
+	uriencode_for_mailto @ 641
+	utos_buf @ 642
+	uudigit @ 643 DATA
+	virtual_get_class @ 644
+	xml_attr_new @ 645
+	xml_close_file @ 646
+	xml_compare_tag @ 647
+	xml_copy_attr @ 648
+	xml_copy_tag @ 649
+	xml_file_put_escape_str @ 650
+	xml_file_put_node @ 651
+	xml_file_put_xml_decl @ 652
+	xml_free_node @ 653
+	xml_free_tree @ 654
+	xml_get_current_tag @ 655
+	xml_get_current_tag_attr @ 656
+	xml_get_dtd @ 657
+	xml_get_element @ 658
+	xml_node_new @ 659
+	xml_open_file @ 660
+	xml_parse_file @ 661
+	xml_parse_next_tag @ 662
+	xml_pop_tag @ 663
+	xml_push_tag @ 664
+	xml_read_line @ 665
+	xml_tag_add_attr @ 666
+	xml_tag_new @ 667
+	xml_truncate_buf @ 668
+	xml_unescape_str @ 669
diff --git a/po/be.po b/po/be.po
index 674b8ed7..56c8d3fc 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2008-05-21 21:16+0300\n"
 "Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -131,79 +131,79 @@ msgstr "памылка здарылася падчас атрымання агі
 msgid "can't parse envelope: %s\n"
 msgstr "немагчыма разабраць агібаючую: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "нельга атрымаць агібаючую\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Немагчыма злучыцца з серверам IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Немагчыма устанавіць сеанс IMAP4 з: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "нельга атрымаць прастору імён\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "нельга выбраць каталог: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "памылка пры выкананні загаду imap: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "Аўтэнтыфікацыя IMAP4 схібіла.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "Уваход на сервер IMAP4 схібіў.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "нельга далучыць %s да %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(адпраўленне файла...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "нельга далучыць паведамленне да %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "нельга скапіраваць %s у %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "памылка пры выкананні загаду imap: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "памылка пры выкананні загаду imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "памылка пры выкананні загаду imap: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не можа канвертаваць UTF-7 у %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не можа канвертаваць %s у UTF-7\n"
@@ -679,7 +679,7 @@ msgstr ""
 "Новыя паведамленні будуць правярацца ў гэтым парадку. Пазначце\n"
 "ў слупку `G' акаунты, якія задзейнічаюць атрыманне лістоў праз `Атр. усе'"
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -820,7 +820,7 @@ msgstr "Дадаць Адрас у Кнігу"
 msgid "Address"
 msgstr "Адрас"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Заўвагі"
@@ -829,28 +829,28 @@ msgstr "Заўвагі"
 msgid "Select Address Book Folder"
 msgstr "Выберыце каталог Адраснай кнігі"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Ф_айл"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/Ф_айл/Новая Кн_іга"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/Ф_айл/Новы _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/Ф_айл/Новы _J-Pilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/Ф_айл/Новы сервер _LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -858,100 +858,100 @@ msgstr "/Ф_айл/Новы сервер _LDAP"
 msgid "/_File/---"
 msgstr "/Ф_айл/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/Ф_айл/_Рэдагаваць"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/Ф_айл/_Сцерці"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/Ф_айл/Запісаць"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Ф_айл/Закрыць"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Праца"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Праца/Капіраваць"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Праца/Ўставіць"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Адрас"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Адрас/Новы Адрас"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Адрас/Новая Гру_па"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Адрас/Новы К_аталог"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Адрас/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Адрас/_Рэдагаваць"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Адрас/_Выдаліць"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Прылады"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Прылады/Імпартаваць файл _LDIF"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Прылады/Імпартаваць файл _CSV"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Даведка"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Даведка/_Аб праграме"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Новы адрас"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Новая гру_па"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Новы к_аталог"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -964,85 +964,85 @@ msgstr "/Новы к_аталог"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Выдаліць"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 msgid "/_Copy"
 msgstr "/_Капіраваць"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 msgid "/_Paste"
 msgstr "/_Уставіць"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адрасная кніга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Каталог"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "Адрас эл.пошты"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Імя:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Да:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Скр.копія:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Выдаліць"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Дадаць"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Пошук"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 msgid "_Close"
 msgstr "За_крыць"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Выдаліць адрас(ы)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Сапраўды выдаліць гэты адрас(ы)?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1051,36 +1051,36 @@ msgstr ""
 "Ці сапраўды жадаеце выдаліць каталог І ўсе адрасы ў `%s' ?\n"
 "Пры выдаленні толькі каталога, адрасы будуць перанесены ў каталог-продак."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Выдаліць каталог"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "Толькі К_аталог"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Каталог і адрас(ы)"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Сапраўды выдаліць `%s' ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Новы карыстальнік, немагчыма запісаць індэксны файл."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Новы карыстальнік, немагчыма запісаць файлы адраснай кнігі."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Старая адрасная кніга паспяхова сканвертаваная."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1088,7 +1088,7 @@ msgstr ""
 "Старая адрасная кніга сканвертаваная,\n"
 "немагчыма запісаць новы індэксны файл адрасоў."
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1096,7 +1096,7 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу,\n"
 "створаны пусты файл новай адраснай кнігі."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1104,7 +1104,7 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу,\n"
 "немагчыма стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1112,15 +1112,15 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу\n"
 "і нельга стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 msgid "Address book conversion error"
 msgstr "Памылка канверсіі адраснай кнігі"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 msgid "Address book conversion"
 msgstr "Канверсія адраснай кнігі"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1128,76 +1128,76 @@ msgid ""
 "%s%c%s"
 msgstr "Немагчыма прачытаць індэкс адрасу"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 msgid "Address Book Error"
 msgstr "Памылка адраснай кнігі"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адрасная кніга сканвертаваная, але нельга запісаць новы файл індэксу "
 "адрасоў."
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу, створаны файлы новай адраснай кнігі."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу, немагчыма стварыць файлы новай "
 "адраснай кнігі."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу і стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Немагчыма прачытаць індэкс адрасу"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 msgid "Address Book Conversion Error"
 msgstr "Памылка канверсіі Адраснай кнігі"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 msgid "Address Book Conversion"
 msgstr "Канверсія Адраснай кнігі"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Інтэрфейс"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адрасная Кніга"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Асоба"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "Адрас эл.пошты"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Група"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -3135,15 +3135,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "другі экземпляр Сілфід ужо выконваецца.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Міграцыя канфігурацыі"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/bg.po b/po/bg.po
index a77166a4..f888d32e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2004-01-09 02:06+0200\n"
 "Last-Translator: Pavel Pyuter <pavel@unix-bg.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -136,80 +136,80 @@ msgstr "грешка при вземане на envelope.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "не може да се анализира envelope: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "не може да се вземе envelope\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не може да се установи връзка с IMAP4 сървър: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не може да се установи IMAP4 сесия с:  %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "не може да се получи пространството от имена\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не може да се избере папка: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "грешка при imap команда: CLOSE\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 удостоверяване провалено.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 влизане провалено.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не може да се прибави %s към %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(изпращане на файл...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "съобщението не може да се прибави към %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не може да се копира %s в %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "грешка при imap команда: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "грешка при imap команда: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "грешка при imap команда: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може да преобразува UTF-7 до %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може да преобразува %s до UTF-7\n"
@@ -679,7 +679,7 @@ msgstr ""
 "За нови съобщения ще бъде проверявано в този ред. Отметнете кутийките\n"
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -822,7 +822,7 @@ msgstr "Добавяне на Адреса към Книгата"
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Забележки"
@@ -831,29 +831,29 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Файл"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Файл/Нова _Книга"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Файл/Нова _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Файл/Нов _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -861,101 +861,101 @@ msgstr "/_Файл/Нов _Сървър"
 msgid "/_File/---"
 msgstr "/_Файл/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Файл/_Редактиране"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Файл/_Изтриване"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Адрес"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Адрес/Нов _Адрес"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Адрес/Нова _Група"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Адрес/Нова _Папка"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Адрес/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Адрес/_Редактиране"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Инструменти"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Нов _Адрес"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Нова _Група"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -968,88 +968,88 @@ msgstr "/Нова _Папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Изтриване"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Копиране..."
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресна книга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Име:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "До:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Изтриване"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Добавяне"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Справка"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "Затваряне"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Изтриване на адрес(ите)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Желаете ли изтриване на адрес(ите)?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1059,38 +1059,38 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "_Folder only"
 msgstr "Само папка"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Папка и Адреси"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Желаете ли изтриване на `%s' ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Нов потребител, не можа да ce запази индексния файл."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Нов потребител, не можа да се запази файла на адресната книга"
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Старата адресна книга конвертирана успешно"
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1098,7 +1098,7 @@ msgstr ""
 "Старата адресна книга конвертирана,\n"
 "не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1106,7 +1106,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга,\n"
 "създадени са нови празни файлове на адресната книга."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1114,7 +1114,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1122,17 +1122,17 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1140,80 +1140,80 @@ msgid ""
 "%s%c%s"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Грешка на адресната книга"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старата адресна книга конвертирана, не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, създадени са нови празни файлове "
 "на адресната книга."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, неуспя създаване на нови файлове "
 "на адресната книга."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга и създаване на нови файлове на "
 "адресната книга."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Лице"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "EMail Адрес"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Група"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP сървър"
 
@@ -3212,16 +3212,16 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "друг Sylpheed е стартиран вече.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Конфигурация на действия"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/cs.po b/po/cs.po
index 063e7664..1878680a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2009-08-29 02:23+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -139,79 +139,79 @@ msgstr "během načítání obálky se vyskytla chyba.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "nelze analyzovat obálku: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "nelze načíst obálku\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nelze se spojit se serverem IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nelze navázat relaci IMAP4 s: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "nelze vyhledat obálku\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "chyba příkazu služby IMAP: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentizace IMAP4 selhala.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "Neúspěšné přihlášení k IMAP4.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nelze připojit %s k %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(posílání souboru...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nelze připojit zprávu k %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nelze kopírovat %s do %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba příkazu služby IMAP: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba příkazu služby IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba příkazu služby IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemůže provést konverzi z UTF-7 na %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemůže provést konverzi z %s na UTF-7\n"
@@ -687,7 +687,7 @@ msgstr ""
 "Nové zprávy budou kontrolovány v uvedeném pořadí. Pokud má být účet\n"
 "kontrolován při volbě \"Přijmout vše\", zaškrtněte políčko ve sloupci \"G\"."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -828,7 +828,7 @@ msgstr "Přidat adresu do adresáře"
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Poznámky"
@@ -837,28 +837,28 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku adresáře"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Soubor"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Soubor/Nový _adresář"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Soubor/Nová _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Soubor/Nový _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/_Soubor/Nový server _LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -866,100 +866,100 @@ msgstr "/_Soubor/Nový server _LDAP"
 msgid "/_File/---"
 msgstr "/_Soubor/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Soubor/Up_ravit"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Soubor/_Smazat"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/V_ložit"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _adresa"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _skupina"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nová s_ložka"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Adresa/--"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/U_pravit"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovat soubor _LDIF"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovat soubor _CSV"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Nová _adresa"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Nová skup_ina"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -972,85 +972,85 @@ msgstr "/Nová s_ložka"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Smazat"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 msgid "/_Copy"
 msgstr "/_Kopírovat"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 msgid "/_Paste"
 msgstr "/_Vložit"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresář"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Složka"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Jméno:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Příjemce:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Přidat"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Vyhledat"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 msgid "_Close"
 msgstr "_Zavřít"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Smazat adresy"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Opravdu chcete smazat tyto adresy?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1059,36 +1059,36 @@ msgstr ""
 "Chcete smazat složku A všechny adresy v \"%s\"?\n"
 "Pokud smažete pouze složku, adresy budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Smazat složku"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "Pouz_e složku"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Složk_u a adresy"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Opravdu smazat \"%s\"?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Nový uživatel, nelze uložit soubor index."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Nový uživatel, nelze uložit soubory s adresářem."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Konverze starého adresáře proběhla úspěšně."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1096,7 +1096,7 @@ msgstr ""
 "Starý adresář převeden,\n"
 "ale nelze uložit nový soubor s indexem."
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1104,7 +1104,7 @@ msgstr ""
 "Konverze adresáře nemohla být provedena,\n"
 "ale byly vytvořeny nové prázdné soubory adresáře."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1112,7 +1112,7 @@ msgstr ""
 "Nelze provést konverzi adresáře,\n"
 "nelze vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1120,15 +1120,15 @@ msgstr ""
 "Nelze provést konverzi adresáře\n"
 "a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 msgid "Address book conversion error"
 msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 msgid "Address book conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1136,72 +1136,72 @@ msgid ""
 "%s%c%s"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 msgid "Address Book Error"
 msgstr "Chyba v adresáři"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr "Starý adresář převeden, ale nelze uložit nový soubor index s adresářem"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Konverze adresáře nemohla být provedena, ale byly vytvořeny nové prázdné "
 "soubory adresáře."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Nelze provést konverzi adresáře a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Nelze provést konverzi adresáře a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 msgid "Address Book Conversion Error"
 msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 msgid "Address Book Conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresář"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -3119,15 +3119,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "aplikace Sylpheed je již spuštěna.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Přenesení uživatelského nastavení"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/da.po b/po/da.po
index 6d77982b..7d468890 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -136,80 +136,80 @@ msgstr "fejl ved modtagelse af kuvert.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "kan ikke læse kuvert: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "kan ikke modtage kovert\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "kan ikke modtage namespace\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 godkendelse fejlede.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fejlet.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan ikke tilføje %s til %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(sender fil...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "kan ikke tilføje meddelelse %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan ikke kopiere %s til %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fejl ved IMAP kommando: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fejl ved IMAP kommand: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan ikke konvertere UTF-7 til %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv can ikke konvertere %s til UTF-7\n"
@@ -683,7 +683,7 @@ msgstr ""
 "Nye meddelelser bliver testet i denne rækkefølge. Afmærk\n"
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -826,7 +826,7 @@ msgstr "Tilføj adresse i adressebog"
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Kommentar"
@@ -835,29 +835,29 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Filer"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Filer/Ny _adressebog"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Filer/Ny _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Filer/Ny _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Filer/Ny _server"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -865,101 +865,101 @@ msgstr "/_Filer/Ny _server"
 msgid "/_File/---"
 msgstr "/_Filer/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Filer/_Redigér"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Filer/_Slet"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigér"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Ny _adresse"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Ny _gruppe"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Ny _mappe"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Redigér"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Funktioner"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Ny _adresse"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Ny _gruppe"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -972,88 +972,88 @@ msgstr "/Ny _mappe"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Slet"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopier..."
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressebog"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Mappe"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Navn:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Til:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Slet"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Overblik"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "Luk"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Slet adresse(r)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Virklig slette adresse(r)?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1062,38 +1062,38 @@ msgstr ""
 "Vil du virkeligt slette mappen OG alla adresser i `%s' ? \n"
 "Hvis kun mappen slettes, vil adresserne blive flyttet til hoved mappen."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Slet mappe"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ny mappe"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mappe og adresser"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Virklig slette `%s' ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Ny bruger, kunne ikke gemme index fil."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Ny bruger, kunne ikke gemme adressebogs fil."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Gammel adressebog konverteret."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1101,7 +1101,7 @@ msgstr ""
 "Gammel adressebog konverteret,\n"
 "men kunne ikke gemme index filen"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1109,7 +1109,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "men nye og tomme filer blev oprettet."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1117,7 +1117,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1125,17 +1125,17 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1143,75 +1143,75 @@ msgid ""
 "%s%c%s"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adressebog fejl"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr "Gammel adressebog konverteret men kunne ikke gemme ny index fil "
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Kunne ikke konvertere adressebog, men har oprettet nye tomme filer "
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Kunne ikke konvertere adressebog, og heller ikke oprette nye tomme filer "
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Kunne ikke konvertere adressebog, og heller ikke oprette nye tomme filer "
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Brugerflade"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -3213,16 +3213,16 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "sylpheed kører allerede.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Handlingsopsæt"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/de.po b/po/de.po
index b345f89e..4bc59e19 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -135,79 +135,79 @@ msgstr "Fehler beim Empfang der Nachrichteneigenschaften.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "kann die Nachrichteneigenschaften nicht bearbeiten: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "kann die Nachrichteneigenschaften nicht empfangen\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kann IMAP4-Sitzung mit %s:%d nicht aufbauen\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "kann Namensraum nicht empfangen\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kann Ablage %s nicht auswählen\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "Fehler beim IMAP-Befehl: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-Beglaubigung fehlgeschlagen.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fehlgeschlagen.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kann %s nicht an %s anhängen\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(Datei versenden...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kann Nachricht nicht anhängen an %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kann %s nicht nach %s kopieren\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fehler beim IMAP-Befehl: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fehler beim IMAP-Befehl: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "Fehler beim IMAP-Befehl: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kann UTF-7 nicht nach %s konvertieren\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kann %s nicht nach UTF-7  konvertieren\n"
@@ -684,7 +684,7 @@ msgstr ""
 "Schalter\n"
 "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' einzuschalten."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -825,7 +825,7 @@ msgstr "Adresse in Adressbuch einfügen"
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Kommentar"
@@ -834,28 +834,28 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datei"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Datei/Neues Adress_buch"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Datei/Neue _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Datei/Neues _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datei/Neuer _LDAP-Server"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -863,100 +863,100 @@ msgstr "/_Datei/Neuer _LDAP-Server"
 msgid "/_File/---"
 msgstr "/_Datei/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Datei/_Bearbeiten"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Datei/_Löschen"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Neue _Adresse"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Neue _Gruppe"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Neue Ab_lage"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Bearbeiten"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Werkzeug"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Werkzeug/Importiere _CSV-Datei"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Neue _Adresse"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Neue _Gruppe"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -969,85 +969,85 @@ msgstr "/Neue Ab_lage"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Löschen"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 msgid "/_Copy"
 msgstr "/_Kopieren"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 msgid "/_Paste"
 msgstr "/_Einfügen"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressbuch"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Ablage"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Name:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "An:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Vorschau"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 msgid "_Close"
 msgstr "_Schließen"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Adresse(n) löschen"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1057,36 +1057,36 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "Nur Abla_ge"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Ablage und _Adressen"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wirklich '%s' löschen ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Neuer Benutzer, kann Index-Datei nicht speichern."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Neuer Benutzer, kann Adressbuch-Dateien nicht speichern."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1094,7 +1094,7 @@ msgstr ""
 "Altes Adressbuch konvertiert,\n"
 "kann neue Adress-Index-Datei nicht speichern"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1102,7 +1102,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "aber erstellte neue leere Adressbuch-Dateien."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1110,7 +1110,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "konnte neue Adressbuch-Dateien nicht erstellen."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1118,15 +1118,15 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren\n"
 "und konnte neue Adressbuch-Dateien erstellen."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 msgid "Address book conversion error"
 msgstr "Adressbuch-Konvertierungsfehler"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 msgid "Address book conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1134,78 +1134,78 @@ msgid ""
 "%s%c%s"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 msgid "Address Book Error"
 msgstr "Adressbuch-Fehler"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Altes Adressbuch konvertiert, neue Adress-Index-Datei konnte nicht "
 "gespeichert werden"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Konnte Adressbuch nicht konvertieren, erstellte aber neue leere Adressbuch "
 "Dateien."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Konnte Adressbuch nicht konvertieren, konnte neue Adressbuch Dateien nicht "
 "erstellen."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Konnte Adressbuch nicht konvertieren und konnte neue Adressbuch Dateien "
 "nicht erstellen."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 msgid "Address Book Conversion Error"
 msgstr "Adressbuch-Konvertierungsfehler"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 msgid "Address Book Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP-Server"
 
@@ -3150,15 +3150,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "Ein anderes Sylpheed läuft schon.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Konfigurationsmigration"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/el.po b/po/el.po
index eac75b85..3534b9c4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0beta5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2007-03-17 00:57+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -138,82 +138,82 @@ msgstr "δημιουργήθηκε σφάλμα κατά τη λήψη του φ
 msgid "can't parse envelope: %s\n"
 msgstr "δεν είναι δυνατή η ανάλυση του φακέλου: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "δεν είναι δυνατή η λήψη του φακέλου\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Δεν είναι δυνατή η σύνδεση στον διακομιστή IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Δεν είναι δυνατή η σύνδεση στον διακομιστή IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 #, fuzzy
 msgid "can't get namespace\n"
 msgstr "Αδυναμία λήψης όνοματος χρήστη"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "σφάλμα στην εντολή imap: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "Η πιστοποίηση στον IMAP4 απέτυχε.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "Η είσοδος στον IMAP4 απέτυχε.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "δεν είναι δυνατή η προσάρτηση του %s στο %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(αποστολή αρχείου...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "Δεν είναι δυνατή η προσθήκη μηνύματος στον φάκελο `%s': %s"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "δεν είναι δυνατή η αντιγραφή του %s στο %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Error while spawning the mbadblocks command: %s."
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 #, fuzzy
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Error while spawning the mbadblocks command: %s."
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "Error while spawning the mbadblocks command: %s."
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "Δεν είναι δυνατή η μετατροπή του UTF-7 σε %s από το iconv\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "Δεν είναι δυνατή η μετατροπή του %s σε UTF-7 από το iconv\n"
@@ -696,7 +696,7 @@ msgstr ""
 "στη στήλη 'G' για να ενεργοποιήσετε τη λήψη μηνυμάτων με την εντολή 'Λήψη "
 "όλων'."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -838,7 +838,7 @@ msgstr "Προσθήκη διεύθυνσης στο ευρετήριο"
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Σχόλια"
@@ -847,28 +847,28 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή φακέλου από το Ευρετήριο διευθύνσεων"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Αρχείο"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Αρχείο/Νέο ε_υρετήριο διευθύνσεων"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Αρχείο/Νέα _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Αρχείο/Νέο _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/_Αρχείο/Προσθήκη νέου διακομιστή _LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -876,101 +876,101 @@ msgstr "/_Αρχείο/Προσθήκη νέου διακομιστή _LDAP"
 msgid "/_File/---"
 msgstr "/_Αρχείο/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Αρχείο/_Επεξεργασία"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Αρχείο/_Διαγραφή"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Αρχείο/_Αποθήκευση"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Αρχείο/_Κλείσιμο"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Επεξεργασία"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Επεξεργασία/_Αντιγραφή"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Επεξεργασία/Ε_πικόλληση"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Διεύθυνση"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Διεύθυνση/Νέα δ_ιεύθυνση"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Διεύθυνση/Νέα ο_μάδα"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Διεύθυνση/Νέος _φάκελος"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Διεύθυνση/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Διεύθυνση/_Επεξεργασία"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Διεύθυνση/_Διαγραφή"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Εργαλεία"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Βοήθεια"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Βοήθεια/_Σχετικά"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Νέα δ_ιεύθυνση"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Νέα _ομάδα"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Νέος _φάκελος"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -983,85 +983,85 @@ msgstr "/Νέος _φάκελος"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Διαγραφή"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 msgid "/_Copy"
 msgstr "/_Αντιγραφή"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 msgid "/_Paste"
 msgstr "/Ε_πικόλληση"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Φάκελος"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Προς:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Κρυφή κοινοποίηση:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Αναζήτηση"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Διαγραφή διεύθυνσης (διευθύνσεων)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Θέλετε σίγουρα να διαγράψετε τις διευθύνσεις;"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1070,37 +1070,37 @@ msgstr ""
 "Θέλετε να διαγράψετε το '%s' ; Αν διαγράψετε μόνο το φάκελο, οι διευθύνσεις "
 "που περιέχει θα μετακινηθούν στον γονικό φάκελο."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Διαγραφή φακέλου"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "_Φάκελος μόνο"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Φάκελος και _διευθύνσεις"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Σίγουρα να διαγραφεί το '%s' ;"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Νέος χρήστης, δεν είναι δυνατή η αποθήκευση του ευρετηρίου."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr ""
 "Νέος χρήστης, δεν είναι δυνατή η αποθήκευση του ευρετηρίου διευθύνσεων."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Το παλιό ευρετήριο διευθύνσεων μετατράπηκε με επιτυχία."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 #, fuzzy
 msgid ""
 "Old address book converted,\n"
@@ -1109,7 +1109,7 @@ msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς,\n"
 "δεν είναι δυνατή η αποθήκευση του νέου ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1117,7 +1117,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του ευρετηρίου διευθύνσεων.\n"
 "Δημιουργήθηκε νέο, κενό αρχείο."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 #, fuzzy
 msgid ""
 "Could not convert address book,\n"
@@ -1126,7 +1126,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1134,17 +1134,17 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του ευρετηρίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Σφάλμα κατά τη μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Μετατροπή ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1152,19 +1152,19 @@ msgid ""
 "%s%c%s"
 msgstr "Δεν είναι δυνατή η ανάγνωση του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Σφάλμα ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 #, fuzzy
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς,\n"
 "δεν είναι δυνατή η αποθήκευση του νέου ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 #, fuzzy
 msgid ""
 "Could not convert address book, but created empty new address book files."
@@ -1172,7 +1172,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων.\n"
 "Δημιουργήθηκε νέο, κενό αρχείο."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 #, fuzzy
 msgid ""
 "Could not convert address book, could not create new address book files."
@@ -1180,7 +1180,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 #, fuzzy
 msgid ""
 "Could not convert address book and could not create new address book files."
@@ -1188,51 +1188,51 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Δεν είναι δυνατή η ανάγνωση του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Σφάλμα κατά τη μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Ευρετήριο διευθύνσεων"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Άτομο"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Ομάδα"
 
 # Untrans.
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
 # Untans.
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "Διακομιστής LDAP"
 
@@ -3204,15 +3204,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "Τρέχει ήδη ένα Sylpheed.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Μεταφορά ρυθμίσεων"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/es.po b/po/es.po
index c89f7e56..70e5a215 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2007-06-09 16:20+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -133,79 +133,79 @@ msgstr "error obteniendo la estructura del mensaje.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "No se puede interpretar la estructura del mensaje: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "no se puede obtener la estructura del mensaje\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar con el servidor IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "No puedo establecer la sesión IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "no se puede obtener el espacio de nombres\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "error en el mandato imap: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "La autentificación IMAP falló.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "no puedo añadir %s a %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(enviando fichero...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "no se puede añadir el mensaje a %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "no puedo copiar %s a %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "error en el mandato imap: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "error en el mandato imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "error en el mandato imap: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no puede convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no puede convertir %s a UTF-7\n"
@@ -682,7 +682,7 @@ msgstr ""
 "El orden de comprobación de mensajes será éste. Marque las casillas\n"
 "en la columna «G» para habilitar la descarga mediante «Recibir todo»."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -823,7 +823,7 @@ msgstr "Añadir dirección a la agenda"
 msgid "Address"
 msgstr "Dirección"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Notas"
@@ -832,28 +832,28 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichero"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Fichero/Nueva _agenda"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Fichero/Nueva _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Fichero/Nuevo _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichero/Nuevo servidor _LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -861,100 +861,100 @@ msgstr "/_Fichero/Nuevo servidor _LDAP"
 msgid "/_File/---"
 msgstr "/_Fichero/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Fichero/_Editar"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Fichero/_Borrar"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Dirección"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Dirección/Nueva _dirección"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Dirección/Nuevo _grupo"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Dirección/Nueva _carpeta"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Dirección/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Dirección/_Editar"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Herramientas/Importar fichero _CSV"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Nueva _dirección"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Nuevo _grupo"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -967,85 +967,85 @@ msgstr "/Nueva _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 msgid "/_Copy"
 msgstr "/_Copiar"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 msgid "/_Paste"
 msgstr "/_Pegar"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Añadir"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Buscar"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 msgid "_Close"
 msgstr "_Cerrar"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1054,36 +1054,36 @@ msgstr ""
 "¿Quiere borrar la carpeta Y todas las direcciones en «%s»? \n"
 "Si sólo borra la carpeta las direcciones se moverán a la carpeta padre."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "Sólo la _carpeta"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "La carpeta y las _direcciones"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente «%s»?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se pudo guardar el fichero índice."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pudo guardar los ficheros de direcciones"
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1091,7 +1091,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se pudo guardar el nuevo fichero índice"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1099,7 +1099,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1107,7 +1107,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "no se pudieron crear los ficheros para la nueva."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1115,15 +1115,15 @@ msgstr ""
 "No se pudo convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para una nueva."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 msgid "Address book conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 msgid "Address book conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1131,78 +1131,78 @@ msgid ""
 "%s%c%s"
 msgstr "No se pudo leer el índice de direcciones"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 msgid "Address Book Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Antigua agenda de direcciones convertida, no se pudo guardar el nuevo "
 "fichero índice"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "No se pudo convertir la antigua agenda, pero se crearon nuevos ficheros "
 "vacíos."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "No se pudo convertir la antigua agenda, no se pudieron crear los ficheros "
 "para la nueva."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "No se pudo convertir la antigua agenda y no se pudieron crear ficheros para "
 "una nueva."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "No se pudo leer el índice de direcciones"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 msgid "Address Book Conversion Error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 msgid "Address Book Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "Dirección de correo"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -3144,15 +3144,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "ya hay otro Sylpheed en ejecución.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Migración de la configuración"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/et.po b/po/et.po
index d3552fb9..d626dcf0 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2002-10-02 09:08+0300\n"
 "Last-Translator: Peeter Vois <Peeter.Vois@mail.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -137,82 +137,82 @@ msgstr "ümbriku võtmisel tekis viga.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "ei suutnud avada ümbrikut: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "ei suuda võtta ümbrikut\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "ei suutnud leida nime asukohta\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ei suuuda valida kausta: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autoriseerimise meetod"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 sissekirjutus ebaõnnestus.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ei suuda %s-d lisada %s-i\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(saadan faili...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ei suuda lisada kirja %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ei suuda %d-d kopeerida %s-i\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imapi käsu täitmisel tekkis viga: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ei suuda konversteerida UTF-7-t %s-ks\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei suuda konverteerida %s-i UTF-7-ks\n"
@@ -687,7 +687,7 @@ msgstr ""
 "*Uusi teateid võetakse selles järjekorras. Märgi kastikesed\n"
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -828,7 +828,7 @@ msgstr "Lisa aadress raamatusse"
 msgid "Address"
 msgstr "Aadress"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Märkused"
@@ -837,29 +837,29 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fail"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Fail/Uus raamat"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Fail/Uus _V-Kaart"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Fail/Uus _JPiloot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fail/Uus _Server"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -867,101 +867,101 @@ msgstr "/_Fail/Uus _Server"
 msgid "/_File/---"
 msgstr "/_Fail/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Fail/R_edigeeri"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Fail/Kustuta"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Aadress"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Aadress/Uus _Aadress"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Aadress/Uus _Grupp"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Aadress/Uus Kaust"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Aadress/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Aadress/R_edigeeri"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Tööriist"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Uus _Aadress"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Uus _Grupp"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -974,88 +974,88 @@ msgstr "/Uus Kaust"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/Kustuta"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Kopeeri..."
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Aadressiraamat"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Kaust"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Kellele:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Kustuta"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Lisa"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Otsi"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "Sulge"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Kustuta aadress(id)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Kas te tõesti soovite aadresse kustutada?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1064,38 +1064,38 @@ msgstr ""
 "Kas te soovite kustutada kataloogi `%s' JA kõik aadressid ?\n"
 "Kui kustutate ainult kataloogi, siis aadressid kantakse pealmisse kausta."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ainult kataloog"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Kaust ja aadressid"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Kas tõesti kustutada `%s' ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Uus kasutaja, ei saanud salvestada indeksifaili."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Uus kasutaja, ei saanud salvestada aadressiraamatu faile."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Vana aadressiraamat uuendati edukalt."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1103,7 +1103,7 @@ msgstr ""
 "Vana aadressiraamat uuendati.\n"
 "ei saanud salvestada uut aadresside indeksifaili"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1111,7 +1111,7 @@ msgstr ""
 "Ei saanud uuendada aadressiraamatut,\n"
 "kuid loodi uued ja tühjad aadressiraamatu failid."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1119,7 +1119,7 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ei suutnud luua uusi aadressiraamatu faile."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1127,17 +1127,17 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ja ei suutnud luua uut aadressiraamatu faile."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Aadressiraamat viiakse uude formaati"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1145,80 +1145,80 @@ msgid ""
 "%s%c%s"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Aadressiraamatu viga"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Uuendati vana aadressiraamat, kuid ei suudetud salvestada uut indeksifaili"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Ei suutnud uuendada aadressiraamatut, kuid loodi tühjad ja uued "
 "aadressiraamatu failid."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Ei suutnud uuendada aadressiraamatut, ei suutnud luua uusi aadressiraamatu "
 "faile."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Ei suutnud uuendada aadressiraamatut ja ei suutnud luua uusi aadressiraamatu "
 "faile."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Kasutajaliides"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "EPosti Aadress"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Grupp"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "V-Kaart"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPiloot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -3217,16 +3217,16 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "üks teine Sylpheed juba töötab.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Tegevuste konfiguratsiooni kirjutamine...\n"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/fr.po b/po/fr.po
index 78f20e73..4a528130 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2008-12-04 00:06+0100\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -143,79 +143,79 @@ msgstr "erreur lors de la lecture de l'enveloppe.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "impossible d'analyser l'enveloppe : %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "Impossible de faire une enveloppe\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur IMAP4 : %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Impossible d'établir une session IMAP4 avec : %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "Impossible d'obtenir l'espace nom\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "erreur avec la commande IMAP : STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "L'authentification IMAP4 a échoué.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "Échec au login IMAP4.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "Impossible de d'ajouter %s à %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(envoi du fichier...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossible d'ajouter le message à %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossible de copier %s vers %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erreur avec la commande IMAP : STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erreur lors de la commande IMAP : EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "erreur avec la commande IMAP : CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne peut convertir de UTF-7 vers %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne peut convertir de %s vers UTF-7\n"
@@ -696,7 +696,7 @@ msgstr ""
 "case dans la colonne G pour relever le courrier du compte \n"
 "correspondant lorsque « Tout relever » est activé"
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -837,7 +837,7 @@ msgstr "Ajouter l'adresse au carnet"
 msgid "Address"
 msgstr "Adresses"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Remarques"
@@ -846,28 +846,28 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Fichier/Nouveau _carnet d'adresses"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Fichier/Nouveau carnet _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Fichier/Nouveau carnet _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -875,100 +875,100 @@ msgstr "/_Fichier/Nouveau _serveur LDAP"
 msgid "/_File/---"
 msgstr "/_Fichier/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Fichier/Édit_er"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Fichier/_Supprimer"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/É_dition"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/É_dition/Co_ller"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Nouvelle _adresse"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Nouveau _groupe"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Nouveau _dossier"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/Édit_er"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Outils/Importer un fichier _CSV"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Nouvelle _adresse"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Nouveau _groupe"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -981,85 +981,85 @@ msgstr "/Nouveau _dossier"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Supprimer"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 msgid "/_Copy"
 msgstr "/_Copier"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 msgid "/_Paste"
 msgstr "/Co_ller"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Dossier"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "À :"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Copie :"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Copie discrète :"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Rechercher"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 msgid "_Close"
 msgstr "_Quitter"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous supprimer la(les) adresse(s) sélectionnée(s) ?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1069,37 +1069,37 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "_Dossier uniquement"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Voulez-vous vraiment supprimer « %s » ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur, impossible d'enregistrer le fichier carnet d'adresses."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1107,7 +1107,7 @@ msgstr ""
 "Ancien carnet d'adresses converti,\n"
 "mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1115,7 +1115,7 @@ msgstr ""
 "Échec lors de la conversion de l'ancien carnet d'adresses.\n"
 "Création d'un nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1123,7 +1123,7 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses.\n"
 "Impossible de créer un nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1131,15 +1131,15 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses\n"
 "et lors de la création d'un nouveau carnet d'adresses."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 msgid "Address book conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 msgid "Address book conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1147,78 +1147,78 @@ msgid ""
 "%s%c%s"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 msgid "Address Book Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Ancien carnet d'adresses converti, mais échec lors de l'écriture du fichier "
 "index"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Échec lors de la conversion du carnet d'adresses. Création d'un nouveau "
 "carnet d'adresses vide."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Échec lors de la conversion du carnet d'adresses et lors de la création d'un "
 "nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Échec lors de la conversion du carnet d'adresses et lors de la création d'un "
 "nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 msgid "Address Book Conversion Error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 msgid "Address Book Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Personne"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Groupe"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
@@ -3178,15 +3178,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "une autre session de Sylpheed existe.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Migration de la configuration"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/gl.po b/po/gl.po
index b65bc6df..24784cb4 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -136,82 +136,82 @@ msgstr "Erro obtendo a estructura da mensaxe.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "Non se pode interpretar a estructura da mensaxe: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "non se pode obter a estructura da mensaxe\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Non se pode conectar con o servidor IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Non podo establecer unha sesión IMAP4 con: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "no se pode obter o espacio de nomes\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "non se pode seleccionar a carpeta: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Fallo de autenticación"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "non podo engadir %s a %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(enviando ficheiro...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "non se pode engadir o mensaxe %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "non podo copiar %d a %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erro no comando imap: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non pode convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non pode convertir %s a UTF-7\n"
@@ -685,7 +685,7 @@ msgstr ""
 "A orde de comprobación de mensaxes será este. Marque as casilas\n"
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -826,7 +826,7 @@ msgstr "Engadir enderezo á axenda"
 msgid "Address"
 msgstr "Enderezo"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Notas"
@@ -835,29 +835,29 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Ficheiro/Nova _axenda"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Ficheiro/Nova _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Ficheiro/Novo _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -865,101 +865,101 @@ msgstr "/_Ficheiro/Novo _servidor"
 msgid "/_File/---"
 msgstr "/_Ficheiro/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Ficheiro/_Editar"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Ficheiro/_Borrar"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Enderezo"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Enderezo/Novo _enderezo"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "//_Enderezo/Novo _grupo"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Enderezo/Nova _carpeta"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Enderezo/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Enderezo/_Editar"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Novo _enderezo"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Novo _grupo"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -972,88 +972,88 @@ msgstr "/Nova _carpeta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Copiar..."
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Engadir"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Buscar"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "Pechar"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Borrar enderezo(s)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente o(s) enderezo(s)?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1062,38 +1062,38 @@ msgstr ""
 "¿Quere borrar a carpeta E todos os enderezos en `%s'? \n"
 "Si so borra a carpeta os enderezos se moverán á carpeta pai."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "_Folder only"
 msgstr "Carpeta só"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Carpeta e enderezos"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente `%s' ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Novo usuario, non se puido gardar o ficheiro índice."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Novo usuario, non se puido gardar os ficheiros de enderezos"
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Antiga axenda de enderezos convertida con éxito"
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1101,7 +1101,7 @@ msgstr ""
 "Antiga axenda de enderezos convertida,\n"
 "non se puido gardar o novo ficheiro índice"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1109,7 +1109,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "pero crearonse novos ficheiros valeiros."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1117,7 +1117,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "Non se puideron crear os ficheiros para a nova."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1125,17 +1125,17 @@ msgstr ""
 "Non se puido convertir a antiga axenda\n"
 "e non se puideron crear ficheiros para unha nova."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Conversión da  axenda"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1143,81 +1143,81 @@ msgid ""
 "%s%c%s"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Error na axenda"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Antiga axenda de enderezos convertida, non se puido gardar o novo ficheiro "
 "índice"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Non se puido convertir a antiga axenda, pero se crearon novos ficheiros "
 "valeiros."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Non se puido convertir a antiga axenda, non se puideron crear os ficheiros "
 "para a nova."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Non se puido convertir a antiga axenda e non se puideron crear ficheiros "
 "para unha nova."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Erro na conversión da axenda"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Persoa"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -3218,16 +3218,16 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "xa hai outro Sylpheed executándose.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "configuración das accions"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/hr.po b/po/hr.po
index f714bf9a..27f012f2 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2001-09-17 13:22+0100\n"
 "Last-Translator: Ante Karamatić <ante@cdnet.com.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -137,83 +137,83 @@ msgstr "došlo je do greške prilikom dobivanja omota.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "ne mogu analizirati omot: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "ne mogu dobiti omot\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne mogu se povezati s IMAP4 poslužiteljom: %s%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, fuzzy, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ne mogu se povezati s IMAP4 poslužiteljom: %s%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "ne mogu dobiti namespace\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autorizacija"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login propao.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu pričvrstiti %s na %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 #, fuzzy
 msgid "(sending file...)"
 msgstr "Šaljem DATA..."
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu obilježiti poruku %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "greška prilikom imap naredbe: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -692,7 +692,7 @@ msgstr ""
 "Nove poruke biti će provjerene ovim redom. Označite pod\n"
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -830,7 +830,7 @@ msgstr "Dodaj adresu u adresar"
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Bilješke"
@@ -839,30 +839,30 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _V-kartica"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 #, fuzzy
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _J-Pilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -870,101 +870,101 @@ msgstr "/_Datoteka/Novi _poslužitelj"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Uredi"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Uredi"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _spis"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Uredi"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Novi _spis"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -977,88 +977,88 @@ msgstr "/Novi _spis"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiraj..."
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresar"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Spis"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Potraži"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "Zatvori"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Uistinu obrisati adresu/e?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1067,38 +1067,38 @@ msgstr ""
 "Želite li obrisati spis I sve adrese u `%s' ? \n"
 "Ukoliko brišete samo spis, adrese će biti premještene u prethodni spis."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Obriši spis"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo spis"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Spis i adrese"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Uistinu obrisati `%s' ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu spretmiti index datoteku."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu spremiti datoteke adresara."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspješno unešen."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1106,7 +1106,7 @@ msgstr ""
 "Stari adresar ne može biti unešen,\n"
 "ne mogu spremiti novu index datoteku adresara."
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1114,7 +1114,7 @@ msgstr ""
 "Ne mogu unjeti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1122,7 +1122,7 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1130,17 +1130,17 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "i ne mogu stvoriti nove datoteke adresara."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1148,74 +1148,74 @@ msgid ""
 "%s%c%s"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr "Stari adresar unešen, ne mogu spremiti index datoteke novih adresa"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Ne mogu unjeti adresar, kreiram prazne datoteke novog adresara."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Ne mogu unjeti adresar, ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Ne mogu unjeti adresar i ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Sučelje"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "V-kartica"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP Poslužitelj"
 
@@ -3241,16 +3241,16 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem konfiguraciju filtera...\n"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/hu.po b/po/hu.po
index 1b690e1d..d690593a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2009-08-15 13:25+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: Hungarian <NONE>\n"
@@ -135,79 +135,79 @@ msgstr "hiba történt a boríték fogadása közben.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "nem lehet értelmezni a borítékot: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "a borítékot nem lehet megszerezni\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 szerverhez nem lehet kapcsolódni\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 szerverhez nem sikerült kapcsolódni: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "névtér nem elérhető\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "%s mappát nem lehet kiválasztani\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "hiba az IMAP parancs közben: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "Az IMAP4 azonosítás nem sikerült.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 bejelentkezés sikertelen.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s nem fűzhető hozzá ehhez: %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(fájl küldése...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "levél nem fűzhető hozzá ehhez: %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s nem másolható ide: %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "hiba az IMAP parancs közben: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "hiba az IMAP parancs közben: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "hiba az IMAP parancs közben: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "az iconv nem tud UTF-7-ből konvertálni ebbe: %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "az iconv nem tudja UTF-7-re konvertálni ezt: %s\n"
@@ -686,7 +686,7 @@ msgstr ""
 "letöltése'\n"
 "funkció bekapcsolásához tegyen pipát a 'G' oszlopban levő négyzetbe!"
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -828,7 +828,7 @@ msgstr "Cím hozzáadása a címjegyzékhez"
 msgid "Address"
 msgstr "Cím"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Megjegyzések"
@@ -837,28 +837,28 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fájl"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Fájl/Új _Címjegyzék"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Fájl/Új _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Fájl/Új _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fájl/Új _LDAP Szerver"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -866,100 +866,100 @@ msgstr "/_Fájl/Új _LDAP Szerver"
 msgid "/_File/---"
 msgstr "/_Fájl/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Fájl/_Szerkesztés"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Fájl/_Törlés"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/S_zerkesztés"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/S_zerkesztés/_Másolás"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/S_zerkesztés/_Beillesztés"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Cím"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Cím/Új _cím"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Cím/Új cso_port"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Cím/Új _mappa"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Cím/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Cím/_Szerkesztés"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl importálása"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Eszközök/_CSV fájl importálása"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Új _cím"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Új cso_port"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -972,85 +972,85 @@ msgstr "/Ú_j Mappa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Törlés"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 msgid "/_Copy"
 msgstr "/_Másolás"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 msgid "/_Paste"
 msgstr "/_Beillesztés"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Címjegyzék"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Mappa"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "Email cím"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Név:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Címzett:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Titkos másolat:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Előnézet"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 msgid "_Close"
 msgstr "Be_zárás"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Cím(ek) törlése"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Tényleg töröljem a cím(ek)et?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1059,36 +1059,36 @@ msgstr ""
 "Tényleg törölni szeretné a(z) `%s' mappát ÉS az összes címet benne?\n"
 "Ha csak a mappát törli, a címek átkerülnek a szülő mappába."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "Cs_ak mappa"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Mappa és _címek"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tényleg törli `%s' elemet?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Az új felhasználó nem tudja menteni az index fájlt."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Az új felhasználó nem tudja menteni a címjegyzék fájlt."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "A régi címjegyzék konvertálása sikerült."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1096,7 +1096,7 @@ msgstr ""
 "A régi címjegyzék konvertálva,\n"
 "nem sikerült menteni az új cím index fájlt."
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1104,7 +1104,7 @@ msgstr ""
 "Nem sikerült a címjegyzék konvertálása,\n"
 "de létrehoztam egy üres új címjegyzéket."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1112,7 +1112,7 @@ msgstr ""
 "Nem sikerült a címjegyzék konvertálása,\n"
 "és nem sikerült az új címjegyzék létrehozása sem."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1120,15 +1120,15 @@ msgstr ""
 "Nem sikerült a címjegyzék konvertálása,\n"
 "és nem sikerült az új címjegyzék létrehozása sem."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 msgid "Address book conversion error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 msgid "Address book conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1136,74 +1136,74 @@ msgid ""
 "%s%c%s"
 msgstr "Cím index olvasása nem sikerült"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 msgid "Address Book Error"
 msgstr "Címjegyzék hiba"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "A régi címjegyzék konvertálva, nem sikerült menteni az új cím index fájlt."
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Nem konvertálható a címjegyzék, de létrehoztam egy új üres címjegyzéket."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Nem konvertálható a címjegyzék, és nem hozható létre új címjegyzék sem."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Nem konvertálható a címjegyzék, és nem hozható létre új címjegyzék sem."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Cím index olvasása nem sikerült"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 msgid "Address Book Conversion Error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 msgid "Address Book Conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Illesztő"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Személy"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "Email cím"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Csoport"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP Szerver"
 
@@ -3121,15 +3121,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "egy másik Sylpheed már fut.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Beállítások migrálása"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/it.po b/po/it.po
index 47cb99c7..3ad21a9a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2008-01-26 09:42+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -134,79 +134,79 @@ msgstr "si è verificato un errore durante la ricezione della busta.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "impossibile analizzare la busta: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "impossibile ricevere la busta\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossibile connettersi al server IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Impossibile stabilire la sessione IMAP4 con: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "impossibile ricevere il namespace\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "impossibile selezionare la cartella: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "errore durante il comando imap: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autenticazione IMAP4 fallita.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "Login IMAP4 fallito.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "impossibile aggiungere %s a %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(spedizione del file...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossibile aggiungere a %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossibile copiare %s in %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "errore durante il comando imap: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "errore durante il comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "errore durante il comando imap: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non può convertire UTF-7 in %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non può convertire %s in UTF-7\n"
@@ -684,7 +684,7 @@ msgstr ""
 "nella\n"
 "colonna «G» per consentire il recupero dei messaggi attraverso «Ricevi tutti»."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -825,7 +825,7 @@ msgstr "Aggiunta dell'indirizzo alla rubrica"
 msgid "Address"
 msgstr "Indirizzo"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Note"
@@ -834,28 +834,28 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_File"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_File/Nuova _rubrica"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_File/Nuova _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_File/Nuovo _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/_File/Nuovo server _LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -863,100 +863,100 @@ msgstr "/_File/Nuovo server _LDAP"
 msgid "/_File/---"
 msgstr "/_File/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_File/_Modifica"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_File/_Elimina"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Modifica"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Modifica/_Incolla"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Indirizzo"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Indirizzo/Nuovo _indirizzo"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Indirizzo/Nuovo _gruppo"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Indirizzo/Nuova _cartella"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Indirizzo/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Indirizzo/_Modifica"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/S_trumenti"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 msgid "/_Tools/Import _CSV file"
 msgstr "/S_trumenti/Importa file _CSV"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Nuovo _indirizzo"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Nuovo _gruppo"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -969,85 +969,85 @@ msgstr "/Nuova _cartella"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/Eli_mina"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 msgid "/_Copy"
 msgstr "/_Copia"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 msgid "/_Paste"
 msgstr "/_Incolla"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Rubrica"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Cartella"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "A:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr " Aggiungi "
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Cerca"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 msgid "_Close"
 msgstr "_Chiudi"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Elimina l'indirizzo(i)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Eliminare l'indirizzo(i)?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1057,36 +1057,36 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "_Solo la cartella"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Cartella e _indirizzi"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Eliminare «%s» ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Nuovo utente, impossibile salvare il file indice."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Nuovo utente, impossibile salvare i file della rubrica."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "La vecchia rubrica è stata convertita con successo."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1094,7 +1094,7 @@ msgstr ""
 "Vecchia rubrica convertita,\n"
 "impossibile salvare il nuovo file indice dell'indirizzo"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1102,7 +1102,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "ma ho creato nuovi file vuoti della rubrica."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1110,7 +1110,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1118,15 +1118,15 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "e impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 msgid "Address book conversion error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 msgid "Address book conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1134,78 +1134,78 @@ msgid ""
 "%s%c%s"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 msgid "Address Book Error"
 msgstr "Errore rubrica"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Vecchia rubrica convertita, impossibile salvare il nuovo file indice "
 "dell'indirizzo"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Impossibile convertire la rubrica, ma ho creato nuovi file vuoti della "
 "rubrica."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Impossibile convertire la rubrica, impossibile creare i nuovi file della "
 "rubrica."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Impossibile convertire la rubrica e impossibile creare i nuovi file della "
 "rubrica."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 msgid "Address Book Conversion Error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 msgid "Address Book Conversion"
 msgstr "Errore rubrica"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "Indirizzo email"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Gruppo"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -3156,15 +3156,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "un altro Sylpheed è già in esecuzione.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Migrazione della configurazione"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/ja.po b/po/ja.po
index f789598d..4a4bc8b6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 1999-10-12\n"
 "Last-Translator: Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -133,79 +133,79 @@ msgstr "エンベロープを取得中にエラーが発生しました。\n"
 msgid "can't parse envelope: %s\n"
 msgstr "エンベロープを解析できません: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "エンベロープを取得できません\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 サーバ: %s:%d に接続できません\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "%s:%d との IMAP4 セッションを確立できません\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "namespace を取得できません\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "フォルダ %s を選択できません\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "imap コマンド中のエラー: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 の認証に失敗しました。\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4のログインに失敗しました。\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s を %s に追加できません\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(ファイルを送信中...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "メッセージを %s に追加できません\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s を %s にコピーできません\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap コマンド中のエラー: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap コマンド中のエラー: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "imap コマンド中のエラー: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv が UTF-7 を %s に変換できません\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv が %s を UTF-7 に変換できません\n"
@@ -680,7 +680,7 @@ msgstr ""
 "新着メッセージはこの順番でチェックされます。「全受信」によるメッセージ\n"
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -821,7 +821,7 @@ msgstr "アドレスをアドレス帳に追加"
 msgid "Address"
 msgstr "アドレス"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "備考"
@@ -830,28 +830,28 @@ msgstr "備考"
 msgid "Select Address Book Folder"
 msgstr "アドレス帳フォルダを選択"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/ファイル(_F)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/ファイル(_F)/新規アドレス帳(_B)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/ファイル(_F)/新規_vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/ファイル(_F)/新規_JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -859,100 +859,100 @@ msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 msgid "/_File/---"
 msgstr "/ファイル(_F)/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/ファイル(_F)/編集(_E)"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/ファイル(_F)/削除(_D)"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/ファイル(_F)/保存(_S)"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/ファイル(_F)/閉じる(_C)"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編集(_E)/コピー(_C)"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/編集(_E)/ペースト(_P)"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/アドレス(_A)"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/アドレス(_A)/新規アドレス(_A)"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/アドレス(_A)/新規グループ(_G)"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/アドレス(_A)/新規フォルダ(_F)"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/アドレス(_A)/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/アドレス(_A)/編集(_E)"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/ツール(_T)"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/ツール(_T)/_LDIFファイルをインポート"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 msgid "/_Tools/Import _CSV file"
 msgstr "/ツール(_T)/_CSVファイルをインポート"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/新規アドレス(_A)"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/新規グループ(_G)"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -965,85 +965,85 @@ msgstr "/新規フォルダ(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/削除(_D)"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 msgid "/_Copy"
 msgstr "/コピー(_C)"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 msgid "/_Paste"
 msgstr "/ペースト(_P)"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "アドレス帳"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "フォルダ"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "名前:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "宛先:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "削除"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "追加"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "検索"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 msgid "_Close"
 msgstr "閉じる(_C)"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "アドレスの削除"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "本当にこのアドレスを削除しますか?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1052,36 +1052,36 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "フォルダのみ(_F)"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "フォルダとアドレス(_A)"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "本当に `%s' を削除しますか?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "新規ユーザ、インデックスファイルを保存できません。"
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "新規ユーザ、アドレス帳ファイルを保存できません。"
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "旧形式のアドレス帳は正しく変換されました。"
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1089,7 +1089,7 @@ msgstr ""
 "旧形式のアドレス帳は変換されました。\n"
 "新規アドレスインデックスファイルに保存できません"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1097,7 +1097,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "しかし空の新規アドレス帳ファイルが作成されました。"
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1105,7 +1105,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1113,94 +1113,95 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 msgid "Address book conversion error"
 msgstr "アドレス帳の変換エラー"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 msgid "Address book conversion"
 msgstr "アドレス帳の変換"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, c-format
 msgid ""
 "Could not read address index:\n"
 "\n"
 "%s%c%s"
-msgstr "アドレスインデックスを読み込めません:\n"
+msgstr ""
+"アドレスインデックスを読み込めません:\n"
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 msgid "Address Book Error"
 msgstr "アドレス帳のエラー"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "旧形式のアドレス帳は変換されましたが、新規アドレスインデックスファイルを保存"
 "できません"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "アドレス帳を変換できませんでしたが、空の新規アドレス帳ファイルが作成されまし"
 "た。"
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "アドレスインデックスを読み込めません"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 msgid "Address Book Conversion Error"
 msgstr "アドレス帳変換エラー"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 msgid "Address Book Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "インタフェース"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "人物"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "グループ"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAPサーバ"
 
@@ -3115,15 +3116,15 @@ msgid "Loading plug-ins..."
 msgstr "プラグインをロード中..."
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "別の Sylpheed がすでに起動しています。\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "設定の移行"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/ko.po b/po/ko.po
index fcd22ef3..9823f81b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2002-12-02 11:09+0900\n"
 "Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -137,82 +137,82 @@ msgstr "envelope를 얻는 중 에러 발생.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "envelope를 파싱할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "envelope를 얻을 수가 없습니다\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 서버에 연결할 수가 없습니다\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 세션을 만들 수 없습니다: %s: %d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "namespace를 얻을 수 없습니다\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "폴더를 선택할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "인증 방법"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 로그인을 실패했습니다.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s를 %s에 붙일 수 없습니다\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(파일을 보냅니다...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "%s 메시지를 추가할 수가 없습니다\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%d를 %s로 복사할 수가 없습니다\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 명령어 실행중 에러: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv가 UTF-7를 %s로 변환할 수 없습니다\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv가 %s를 UTF-7로 변환할 수 없습니다\n"
@@ -676,7 +676,7 @@ msgstr ""
 "새 메시지는 이 순서대로 확인될 것입니다. `모두 받기'로 메시지를\n"
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -817,7 +817,7 @@ msgstr "주소록에 추가"
 msgid "Address"
 msgstr "주소"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "메모"
@@ -826,29 +826,29 @@ msgstr "메모"
 msgid "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/파일(_F)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/파일(_F)/새 주소록(_B)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/파일(_F)/새 vCard(_v)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/파일(_F)/새 JPilot(_J)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -856,101 +856,101 @@ msgstr "/파일(_F)/새 서버(_S)"
 msgid "/_File/---"
 msgstr "/파일(_F)/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/파일(_F)/편집(_E)"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/파일(_F)/삭제(_D)"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/주소(_A)"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/주소(_A)/새 주소(_A)"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/주소(_A)/새 그룹(_G)"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/주소(_A)/새 폴더(_F)"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/주소(_A)/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/주소(_A)/편집(_E)"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/도구(_T)"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/새 주소(_A)"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/새 그룹(_G)"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -963,88 +963,88 @@ msgstr "/새 폴더(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/삭제(_D)"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/복사(_C)..."
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "주소록"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "폴더"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "이름:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "받는 사람:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "참조:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "숨은 참조:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "삭제"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "추가"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "찾기"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "닫기"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "주소를 삭제"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "정말로 주소를 삭제하시겠습니까?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1053,38 +1053,38 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "_Folder only"
 msgstr "폴더만"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "폴더와 주소"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "정말로 `%s'를 지우시겠습니까?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "새 사용자, 색인 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "새 사용자, 주소록 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "예전 주소록을 성공적으로 변환하였습니다."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1092,7 +1092,7 @@ msgstr ""
 "예전 주소록이 변환되었습니다,\n"
 "새 주소록의 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1100,7 +1100,7 @@ msgstr ""
 "주소록을 변환할 수 없습니다,\n"
 "대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1108,7 +1108,7 @@ msgstr ""
 "주소록을 변환하지 못했습니다,\n"
 "새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1116,17 +1116,17 @@ msgstr ""
 "주소록을 변환하지 못했고\n"
 "새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1134,74 +1134,74 @@ msgid ""
 "%s%c%s"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "주소록 에러"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr "예전 주소록이 변환되었습니다, 새 주소록 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "주소록을 변환할 수 없습니다, 대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "주소록을 변환하지 못했습니다, 새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "주소록을 변환하지 못했고 새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "인터페이스"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "주소록"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "사람"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "그룹"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP 서버"
 
@@ -3192,16 +3192,16 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "다른 Sylpheed가 이미 실행되고 있습니다.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "동작 설정을 씁니다...\n"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/lt.po b/po/lt.po
index 26d8964c..688d911c 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2005-06-09 13:51+0300\n"
 "Last-Translator: Vitalijus Valantiejus <vitalijus@users.sf.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -133,79 +133,79 @@ msgstr "klaida gaunant voką.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "negaliu išanalizuoti voko: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "nagaliu gauti voko\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie IMAP4 serverio: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Negaliu sukurti IMAP4 sesijos su: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "negalių gauti vardų zonos\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "negaliu pasirinkti katalogo: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "klaida vykdant imap komandą: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentiškumo tikrinimas nepavyko.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "nepavyko prisijungti prie IMAP4\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "negaliu prirašyti %s į %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(siunčiamas failas...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "negaliu pridėti laiško į %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "negaliu nukopijuoti %s į %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "klaida vykdant imap komandą: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "klaida vykdant imap komandą: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "klaida vykdant imap komandą: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv negali konvertuoti UTF-7 į %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv negali konvertuoti %s į UTF-7\n"
@@ -681,7 +681,7 @@ msgstr ""
 "Nauji laiškai bus tikrinami šia tvarka. Pažymėkite laukelį\n"
 "skulpelyje „G“ jei norite gauti laiškus pasirinkę „Gauti visus“."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -822,7 +822,7 @@ msgstr "Įdėti adresą į knygą"
 msgid "Address"
 msgstr "Adresai"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Pastabos"
@@ -831,28 +831,28 @@ msgstr "Pastabos"
 msgid "Select Address Book Folder"
 msgstr "Pažymėkite adresų knygos katalogą"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Failas"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Failas/Nauja _Knyga"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Failas/Nauja „_vCard“ kortelė"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Failas/Naujas _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/_Failas/Naujas _LDAP serveris"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -860,100 +860,100 @@ msgstr "/_Failas/Naujas _LDAP serveris"
 msgid "/_File/---"
 msgstr "/_Failas/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Failas/_Taisa"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Failas/Išt_rinti"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Failas/Iš_saugoti"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Failas/_Užverti"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Taisa"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Taisa/Kopi_juoti"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Taisa/Į_dėti"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Adresas"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Adresas/Naujas _adresas"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Adresas/Nauja _grupė"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Adresas/Naujas _katalogas"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Adresas/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Adresas/_Redaguoti"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Į_rankiai"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Į_rankiai/Importuoti _LDIF failą"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 msgid "/_Tools/Import _CSV file"
 msgstr "/Į_rankiai/Importuoti _CSV failą"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Naujas _adresas"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Nauja _grupė"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -966,85 +966,85 @@ msgstr "/Naujas _katalogas"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Ištrinti"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 msgid "/_Copy"
 msgstr "/_Kopijuoti"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 msgid "/_Paste"
 msgstr "/Į_dėti"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresų knyga"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Katalogas"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Vardas:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Kam:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Slapta kopija:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Pridėti"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Ieškoti"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 msgid "_Close"
 msgstr "Uždaryti"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Pašalinti adresą(-us)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Ar tikrai pašalinti adresą(-us)?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1053,36 +1053,36 @@ msgstr ""
 "Ar tikrai norite pašalinti katalogą „%s“ ir visus adresus jame? \n"
 "Jei pašalinsite tik katalogą, adresai bus perkelti į aukštesnįjį katalogą."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "Tik _katalogą"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Katalogą ir _adresus jame"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tikrai pašalinti „%s“?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Naujas vartotojas, negaliu išsaugoti „index“ failo."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Naujas vartotojas, negaliu išsaugoti adresų knygos failų."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Adresų knyga sėkmingai konvertuota"
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1090,7 +1090,7 @@ msgstr ""
 "Sena adresų knyga konvertuota,\n"
 "negaliu išsaugoti naujo adresų indekso failo"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1098,7 +1098,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "bet sukūriau tuščius naujos knygos failus."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1106,7 +1106,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1114,15 +1114,15 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "ir negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 msgid "Address book conversion error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 msgid "Address book conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1130,74 +1130,74 @@ msgid ""
 "%s%c%s"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 msgid "Address Book Error"
 msgstr "Adresų knygos klaida"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr "Sena knyga konvertuota, negaliu išsaugoti naujo adresų indekso failo"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Negaliu konvertuoti adresų knygos, bet sukūriau naujus tuščius adresų knygos "
 "failus."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Negaliu konvertuoti adresų knygos, negaliu sukurti naujų adresų knygos failų."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Negaliu konvertuoti adresų knygos ir sukurti naujų adresų knygos failų."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 msgid "Address Book Conversion Error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 msgid "Address Book Conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Sąsaja"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Asmuo"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Grupė"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
@@ -3132,15 +3132,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed jau paleistas.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Konfigūracijos atnaujinimas"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/nl.po b/po/nl.po
index dd123b92..7f393fb3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -136,79 +136,79 @@ msgstr "Er is een fout opgetreden bij het verkrijgen van de envelop.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "kan de envelop niet verwerken: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "kan de envelop niet verkrijgen\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan niet verbinden met de IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kan gaan sessie opzetten met de IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "kan de NAMESPACE niet vinden\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "Fout bij IMAP-opdracht: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-identificatie mislukt.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login mislukt.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan %s niet toevoegen aan %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(bestand wordt verzonden...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kan bericht niet toevoegen aan %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan %s niet naar %s kopiëren\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fout bij IMAP-opdracht: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "Fout bij IMAP-opdracht: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan UTF-7 niet naar %s omzetten\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan %s niet naar UTF-7 omzetten\n"
@@ -691,7 +691,7 @@ msgstr ""
 "Zet een vinkje in de 'G' kolom om berichten binnen te halen wanneer\n"
 "u op de knop 'Alles ophalen' klikt."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -832,7 +832,7 @@ msgstr "Adres toevoegen aan adresboek"
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Opmerkingen"
@@ -841,28 +841,28 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Bestand"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Bestand/Nieuw _adresboek"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Bestand/Nieuwe _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Bestand/Nieuwe _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/_Bestand/Nieuwe _LDAP-server"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -870,101 +870,101 @@ msgstr "/_Bestand/Nieuwe _LDAP-server"
 msgid "/_File/---"
 msgstr "/_Bestand/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Bestand/Aanpassen"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Bestand/_Verwijderen"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Be_werken/_Kopiëren"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/Be_werken/_Plakken"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Nieuw _adres"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Nieuwe _groep"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Nieuwe _map"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Bewerken"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Gereedschap"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Nieuw _adres"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Nieuwe _groep"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -977,88 +977,88 @@ msgstr "/Nieuwe _map"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/Ver_wijderen"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopieer..."
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Be_werken/_Plakken"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresboek"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Accounts"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Aan:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Zoeken"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "Kleuren"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Adres(sen) verwijderen"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Wilt u de adressen werkelijk verwijderen?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1068,36 +1068,36 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "Alleen _map"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Map en _adressen"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wilt u '%s' werkelijk verwijderen?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Nieuwe gebruiker: Kon indexbestand niet opslaan."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker: Kon adresboekbestanden niet opslaan."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Oude adresboekgegevens succesvol omgezet."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1105,7 +1105,7 @@ msgstr ""
 "Oude adresboekgegevens omgezet.\n"
 "Kon het nieuwe adresboek indexbestand niet opslaan."
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1113,7 +1113,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Nieuw leeg adresboek is gemaakt."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1121,7 +1121,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon geen nieuwe adresboek bestanden aanmaken."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1129,17 +1129,17 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon ook geen nieuwe adresboekbestanden aanmaken."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adresboek omzetting"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1147,79 +1147,79 @@ msgid ""
 "%s%c%s"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adresboekprobleem"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Oude adresboekgegevens omgezet. Kon het nieuwe adresboek indexbestand niet "
 "opslaan."
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Kon adresboekgegevens niet omzetten. Nieuw leeg adresboek is gemaakt."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Kon adresboekgegevens niet omzetten. Kon geen nieuwe adresboek bestanden "
 "aanmaken."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Kon adresboekgegevens niet omzetten. Kon ook geen nieuwe adresboek bestanden "
 "aanmaken."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Groep"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -3180,15 +3180,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "er draait al een Sylpheed.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Configuratie omzetten"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/pl.po b/po/pl.po
index b19bc955..a6b0dede 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2008-06-17 22:25+0100\n"
 "Last-Translator: Jan Stępień <jstepien@users.sourceforge.net>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -131,79 +131,79 @@ msgstr "wystąpił błąd podczas pobierania koperty.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "nie można przetworzyć koperty: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "nie można pobrać koperty\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nie można nawiązać połączenia z serwerem IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nie można ustanowić sesji IMAP4 z: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "nie można pobrać przestrzeni nazw\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nie można wybrać katalogu: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "błąd polecenia IMAP: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "Błąd uwierzytelniania IMAP4.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "Nie można zalogować się do serwera IMAP4.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nie można dołączyć %s do %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(wysyłanie pliku...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nie można dołączyć wiadomości do %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nie można skopiować %s do %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "nie można skonwertować UTF-7 do %s za pomocą programu iconv\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "nie można skonwertować %s do UTF-7 za pomocą programu iconv\n"
@@ -675,7 +675,7 @@ msgstr ""
 "Nowe wiadomości zostaną sprawdzone w tej kolejności. Zaznacz\n"
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -816,7 +816,7 @@ msgstr "Dodaj do książki adresowej"
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Uwagi"
@@ -825,28 +825,28 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Plik"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Plik/Nowa _książka"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Plik/Nowy _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Plik/Nowy _J-Pilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/_Plik/Nowy serwer _LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -854,100 +854,100 @@ msgstr "/_Plik/Nowy serwer _LDAP"
 msgid "/_File/---"
 msgstr "/_Plik/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Plik/_Edycja"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Plik/_Usuń"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Edycja/_Wstaw"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Plik/Nowy _adres"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Plik/Nowa _grupa"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Plik/Nowy _katalog"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Edycja"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Narzędzia"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Narzędzia/Importuj plik _CSV"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Nowy _adres"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Nowa _grupa"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -960,85 +960,85 @@ msgstr "/Nowy _katalog"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Usuń"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 msgid "/_Copy"
 msgstr "/_Kopiuj"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 msgid "/_Paste"
 msgstr "/_Wklej"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Książka adresowa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Katalog"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Do:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Wyszukaj"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 msgid "_Close"
 msgstr "_Zamknij"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Usuń adres(y)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Czy naprawdę chcesz usunąć ten adres(y)?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1048,36 +1048,36 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "_Tylko katalog"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Katalog i _adresy"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Czy naprawdę usunąć \"%s\" ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Nowy użytkownik, nie można było zapisać pliku indeksu."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Nowy użytkownik, nie można było zapisać plików książki adresowej."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Konwersja starej książki adresowej została zakończona pomyślnie."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1085,7 +1085,7 @@ msgstr ""
 "Stara książka adresowa została skonwertowana,\n"
 "nie można było zapisać nowego pliku indeksu adresów."
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1093,7 +1093,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "utworzono puste pliki nowej książki adresowej."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1101,7 +1101,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "nie można było utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1109,15 +1109,15 @@ msgstr ""
 "Nie można było skonwertować książki adresowej\n"
 "oraz utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 msgid "Address book conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 msgid "Address book conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1125,78 +1125,78 @@ msgid ""
 "%s%c%s"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 msgid "Address Book Error"
 msgstr "Błąd książki adresowej"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Stara książka adresowa została skonwertowana, nie można było zapisać nowego "
 "pliku indeksów adresowych."
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Nie można było skonwertować książki adresowej lecz utworzono puste pliki "
 "nowej książki adresowej."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Nie można było skonwertować książki adresowej oraz utworzyć nowych plików "
 "książki adresowej."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Nie można było skonwertować książki adresowej i utworzyć nowych plików "
 "książki adresowej"
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 msgid "Address Book Conversion Error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 msgid "Address Book Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
@@ -3127,15 +3127,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "Jest już uruchomiona kopia programu Sylpheed.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Migracja ustawień"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index df1b2d97..9132c14d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2009-07-14 12:28-0400\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -141,79 +141,79 @@ msgstr "Ocorreu um erro ao obter 'envelope'\n"
 msgid "can't parse envelope: %s\n"
 msgstr "não foi possível realizar o parse no envelope: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "Não foi possível obter o 'envelope'\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Não foi possível se conectar ao servidor IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Não foi possível estabelecer uma sessão IMAP4 com: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "Não foi possível obter o 'envelope'\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não posso selecionar pasta: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "erro no comando imap: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "Falha na autenticação IMAP4.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "Falha ao logar no servidor IMAP4.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "não foi possível copiar a mensagem %s para %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(enviando arquivo...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "não foi possível anexar a mensagem em %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "não posso copiar %s para %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erro no comando imap: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "o iconv não pode converter UTF-7 para %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "o iconv não pode converter %s para UTF-7\n"
@@ -689,7 +689,7 @@ msgstr ""
 "Mensagens novas serão baixadas nessa ordem. Marque as caixas\n"
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -830,7 +830,7 @@ msgstr "Adicionar ao Catálogo de Endereços"
 msgid "Address"
 msgstr "Endereço"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Notas"
@@ -839,28 +839,28 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione Pasta do Catálogo de Endereços"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arquivo"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Arquivo/Novo _Livro"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Arquivo/Novo _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Arquivo/Novo _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arquivo/Novo Servidor _LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -868,100 +868,100 @@ msgstr "/_Arquivo/Novo Servidor _LDAP"
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Arquivo/_Editar"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Arquivo/_Apagar"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Endereço"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Endereço/Novo _Endereço"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Endereço/Novo _Grupo"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Endereço/Nova _Pasta"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Endereço/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Endereço/_Editar"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar arquivo _CSV"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Novo _Endereço"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Novo _Grupo"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -974,85 +974,85 @@ msgstr "/Nova _Pasta"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Apagar"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 msgid "/_Copy"
 msgstr "/_Copiar"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 msgid "/_Paste"
 msgstr "/Co_lar"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Pasta"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Cco:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Procurar"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 msgid "_Close"
 msgstr "_Fechar"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Apagar endereço(s)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Apagar realmente o(s) endereço(s)?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1061,37 +1061,37 @@ msgstr ""
 "Você quer apagar a pasta E todos os endereços em `%s' ?\n"
 "Caso apague somente a pasta, os endereços serão movidos para a pasta pai."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "_Pasta apenas"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Pasta e _endereços"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Apagar realmente `%s' ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr ""
 "Novo usuário, não foi possível salvar arquivos do catálogo de endereços."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Catálogo de endereços antigo convertido com sucesso."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1099,7 +1099,7 @@ msgstr ""
 "Catálogo de endereços antigo convertido,\n"
 "não foi possível salvar o arquivo de índice de endereços "
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1107,7 +1107,7 @@ msgstr ""
 "Não foi possível converter o catálogo de endereços,\n"
 "mas arquivos vazios para o catálogo de endereços foram criados."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1115,7 +1115,7 @@ msgstr ""
 "Não foi possível converter o catálogo de endereços,\n"
 "não foi possível criar arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1123,15 +1123,15 @@ msgstr ""
 "Não foi possível converter o catálogo de endereços\n"
 "nem criar arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 msgid "Address book conversion error"
 msgstr "Erro convertendo catálogo de endereços"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 msgid "Address book conversion"
 msgstr "Conversão do catálogo de endereços"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1139,78 +1139,78 @@ msgid ""
 "%s%c%s"
 msgstr "Não foi possível ler o índice do endereço"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 msgid "Address Book Error"
 msgstr "Erro no Catálogo de Endereços"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Catálogo de endereços antigo convertido, mas não foi possível salvar o "
 "arquivo de indíce do novo"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Não foi possível converter o catálogo de endereços, mas arquivos vazios para "
 "o catálogo de endereços foram criados."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Não foi possível converter o catálogo de endereços, não foi possível criar "
 "arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Não foi possível converter o catálogo de endereços e não foi possível criar "
 "arquivos novos para o catálogo de endereços."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice do endereço"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 msgid "Address Book Conversion Error"
 msgstr "Erro na conversão do catálogo de endereços"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 msgid "Address Book Conversion"
 msgstr "Conversão do Catálogo de Endereços"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Catálogo de Endereços"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Pessoa"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -3152,15 +3152,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "outra cópia do Sylpheed já está sendo executada.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Migração da configuração"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/ro.po b/po/ro.po
index 22fffe5e..afea3a00 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2008-12-05 03:06+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: \n"
@@ -141,81 +141,81 @@ msgid "can't parse envelope: %s\n"
 msgstr "„envelope” (informația de routing) nu poate fi analizată: %s\n"
 
 # hm ? envelope conform wikipedia
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "nu se poate obține „envelope” (informația de routing)\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nu se poate efectua conexiunea la serverul IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nu se poate stabili sesiunea IMAP4 cu: %s:%d\n"
 
 # hm ?
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "nu se poate obține spațiul de nume\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nu se poate selecta dosarul: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "eroare la comanda IMAP: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentificarea IMAP4 a eșuat.\n"
 
 # hm ? cu ce diferă de authentication ?
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificarea IMAP4 a eșuat.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nu se poate adăuga %s la %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(trimitere fișier...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nu se poate adăuga mesajul la %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nu se poate copia %s la %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "eroare în timpul comenzii IMAP: STORE:%s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "eroare în timpul comenzii IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "eroare în timpul comenzii IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nu poate efectua conversia UTF-7 la %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nu poate efectua conversia %s la UTF-7\n"
@@ -695,7 +695,7 @@ msgstr ""
 "coloana „G”\n"
 "pentru a activa recepționarea mesajelor la comanda „Verifică tot”."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -845,7 +845,7 @@ msgstr "Adăugare în agendă"
 msgid "Address"
 msgstr "Agendă"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Observații"
@@ -854,28 +854,28 @@ msgstr "Observații"
 msgid "Select Address Book Folder"
 msgstr "Selectați dosarul pentru agendă"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fișier"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Fișier/A_gendă nouă"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Fișier/_vCard nou"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Fișier/_JPilot nou"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fișier/Server _LDAP nou"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -883,101 +883,101 @@ msgstr "/_Fișier/Server _LDAP nou"
 msgid "/_File/---"
 msgstr "/_Fișier/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Fișier/_Editare"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Fișier/Ș_terge"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Fișier/_Salvează"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fișier/În_chide"
 
 # comun și în main menu și în rmb agendă
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editare"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiază"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Editare/Li_pește"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/A_dresă"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/A_dresă/_Adresă nouă"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/A_dresă/_Grup nou"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/A_dresă/_Dosar nou"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/A_dresă/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/A_dresă/_Editare"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/A_dresă/Ș_terge"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Unelte"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Unelte/Importă un fișier _LDIF"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Unelte/Importă un fișier _CSV"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ajutor/_Despre"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/_Adresă nouă"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/_Grup nou"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/_Dosar nou"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -991,86 +991,86 @@ msgid "/---"
 msgstr "/---"
 
 # comun și la intrare în agendă și la rmb pe mesaj
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/Șter_ge"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 msgid "/_Copy"
 msgstr "/_Copiază"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 msgid "/_Paste"
 msgstr "/Li_pește"
 
 # tooltip peste butonul Agendă
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Agendă"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Dosar"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "Adresă de e-mail"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr " Nume:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Către:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Șterge"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Adaugă"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Căutare"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 msgid "_Close"
 msgstr "În_chide"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Ștergere adresă (adrese)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Sigur doriți să ștergeți adresa (adresele) ?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1079,36 +1079,36 @@ msgstr ""
 "Vreți să ștergeți dosarul ȘI toate adresele din „%s” ?\n"
 "Dacă ștergeți doar dosarul, adresele vor fi mutate în dosarul părinte."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Ștergere dosar"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "Doar _dosar"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Dosar și _adrese"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Sigur doriți să ștergeți „%s” ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Utilizator nou, fișierul index nu a putut fi salvat."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Utilizator nou, fișierele agendei nu au putut fi salvate."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Agenda veche a fost convertită cu succes."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1116,7 +1116,7 @@ msgstr ""
 "Agenda veche a fost convertită, dar\n"
 "fișierul index al noii agende nu a putut fi salvat."
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1124,7 +1124,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, dar\n"
 "au fost create fișierele noi de agendă goală."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1132,7 +1132,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, iar\n"
 "fișierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1140,15 +1140,15 @@ msgstr ""
 "Agenda nu a putut fi convertită\n"
 "și fișierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 msgid "Address book conversion error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 msgid "Address book conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1156,78 +1156,78 @@ msgid ""
 "%s%c%s"
 msgstr "Fișierul index al agendei nu a putut fi citit"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 msgid "Address Book Error"
 msgstr "Eroare agendă"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Agenda veche a fost convertită, iar fișierul index al noii agende nu a putut "
 "fi salvat."
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Agenda nu a putut fi convertită, dar au fost create fișierele noi de agendă "
 "goală."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Agenda nu a putut fi convertită, iar fișierele noi de agendă nu au putut fi "
 "create."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Agenda nu a putut fi convertită și fișierele noi de agendă nu au putut fi "
 "create."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Fișierul index al agendei nu a putut fi citit"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 msgid "Address Book Conversion Error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 msgid "Address Book Conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Interfață"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Agendă"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Persoană"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "Adresă de e-mail"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Grupă"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -3202,15 +3202,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "rulează deja o altă sesiune Sylpheed.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Migrarea configurației"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/ru.po b/po/ru.po
index dc62f27f..99eed729 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2009-08-10 17:45+0400\n"
 "Last-Translator: Ilya Ponetayev <instenet@gmail.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -139,79 +139,79 @@ msgstr "ошибка при получении данных конверта.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "ошибка при разборе данных конверта: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "не удалось получить данные конверта\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не удалось соединиться с сервером IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не удалось открыть сеанс связи IMAP4 c %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "не удалось получить пространство имён\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "невозможно выбрать папку: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "ошибка при выполнении команды IMAP: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "Ошибка аутентификации IMAP4.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "Ошибка авторизации IMAP4.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не удалось добавить %s к %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(передача файла...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не удалось добавить сообщение к %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не удалось скопировать %s в %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "ошибка при выполнении команды IMAP: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "ошибка при выполнении команды IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "ошибка при выполнении команды IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "ошибка преобразования iconv из UTF-7 в %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "ошибка преобразования iconv из %s в UTF-7\n"
@@ -689,7 +689,7 @@ msgstr ""
 "Пометьте в колонке \"G\" учётные записи, которые нужно проверять\n"
 "по команде \"Получить все\"."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -830,7 +830,7 @@ msgstr "Добавление адреса в книгу"
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Примечание"
@@ -839,28 +839,28 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/Файл/Новая книга"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/Файл/Новый файл vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новый файл JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новый сервер LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -868,100 +868,100 @@ msgstr "/Файл/Новый сервер LDAP"
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/Файл/Правка"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/Файл/Удалить"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Правка"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/Правка/Вставить"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/Адрес"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/Адрес/Новый адрес"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/Адрес/Новая группа"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/Адрес/Новая папка"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/Адрес/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/Адрес/Правка"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Инструменты"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 msgid "/_Tools/Import _CSV file"
 msgstr "/Инструменты/Импорт файла CSV"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Новый адрес"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Новая группа"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Новая папка"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -974,85 +974,85 @@ msgstr "/Новая папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/Удалить"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 msgid "/_Copy"
 msgstr "/Копировать"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 msgid "/_Paste"
 msgstr "/Вставить"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресная книга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Скрытно:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Добавить"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Найти"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 msgid "_Close"
 msgstr "Закрыть"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Удалить адрес(а)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Действительно удалить адрес(а)?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1061,36 +1061,36 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Удалить папку"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "Только папку"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Папку и адреса"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Действительно удалить \"%s\"?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Новый пользователь; не удалось сохранить индексный файл."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Новый пользователь; не удалось сохранить файлы адресной книги."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Старая адресная книга успешно преобразована."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1098,7 +1098,7 @@ msgstr ""
 "Старая адресная книга преобразована,\n"
 "не удалось сохранить новый индексный файл."
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1106,7 +1106,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "создана пустая адресная книга."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1114,7 +1114,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "ошибка при создании файлов адресной книги."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1122,15 +1122,15 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "кроме того, произошла ошибка при создании файлов новой адресной книги."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 msgid "Address book conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 msgid "Address book conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1138,77 +1138,77 @@ msgid ""
 "%s%c%s"
 msgstr "Не удалось прочитать индекс адресов"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 msgid "Address Book Error"
 msgstr "Ошибка при работе с адресной книгой"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адресная книга преобразована, не удалось сохранить новый индексный "
 "файл"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, создана пустая адресная книга."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, ошибка при создании новых файлов "
 "адресной книги"
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, кроме того, произошла ошибка при "
 "создании новых файлов адресной книги."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Не удалось прочитать индекс адресов"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 msgid "Address Book Conversion Error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 msgid "Address Book Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Контакт"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Группа"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -3144,15 +3144,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "другая копия Sylpheed уже запущена.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Импорт предыдущей конфигурации"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/sk.po b/po/sk.po
index 073e837c..4dcbc9ec 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2004-01-22 17:46+0100\n"
 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -136,80 +136,80 @@ msgstr "pri získavaní obálky sa vyskytla chyba.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "obálka sa nedá prečítať: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "obálka sa nedá načítať\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nedá sa pripojiť k serveru IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nedá sa vytvoriť IMAP4 spojenie s: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "nedá sa nájsť obálka\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "priečinok sa nedá vytvoriť: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentizácia bola neúspešná.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "neúspešné prihlásenie k IMAP4.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nedá sa napojiť %s k %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(posielam súbor...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nedá sa napojiť správa k %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nedá sa kopírovať %s do %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba pri IMAP príkaze: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba pri IMAP príkaze: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
@@ -681,7 +681,7 @@ msgstr ""
 "Nové správy budú kontrolované v tomto poradí. Ak má byť konto kontrolované\n"
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -824,7 +824,7 @@ msgstr "Pridať adresu do adresára"
 msgid "Address"
 msgstr "Adresár"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Poznámky"
@@ -833,29 +833,29 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Súbor"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Súbor/Nový _Adresár"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Súbor/Nový _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Súbor/Nový _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Súbor/Nový _Server"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -863,101 +863,101 @@ msgstr "/_Súbor/Nový _Server"
 msgid "/_File/---"
 msgstr "/_Súbor/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Súbor/_Upraviť"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Súbor/Z_mazať"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _Adresa"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _Skupina"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nový _Priečinok"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Adresa/--- "
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Upraviť"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Nová _Adresa"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Nová _Skupina"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -970,88 +970,88 @@ msgstr "/Nový _Priečinok"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/Z_mazať"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopírovať..."
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Priečinok"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Meno:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Zmazať"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Pridať"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Vyhľadať"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "Zavrieť"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Zmazať adresu(y)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Naozaj zmazať adresu(y)?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1060,38 +1060,38 @@ msgstr ""
 "Naozaj chcete zmazať priečinok A SÚČASNE všetky adresy v %s ?\n"
 "Ak zmažete len priečinok, adresy z neho sa presunú do nadradeného priečinku."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "_Folder only"
 msgstr "Len priečinok"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Priečinok aj adresy"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Naozaj zmazať '%s' ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Nový uživateľ; nepodarilo sa uložiť indexový súbor."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Nový uživateľ; nedajú sa uložiť súbory adresára."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1099,7 +1099,7 @@ msgstr ""
 "Konverzia starého adresára prebehla,\n"
 "nedá sa uložiť indexový súbor nového adresára"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1107,7 +1107,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "ale boli vytvorené prázdne súbory nového adresára."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1115,7 +1115,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1123,17 +1123,17 @@ msgstr ""
 "Nedá sa konvertovať starý adresár\n"
 "a nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1141,81 +1141,81 @@ msgid ""
 "%s%c%s"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Chyba v adresári"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Konverzia starého adresára prebehla, nedá sa uložiť indexový súbor nového "
 "adresára"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Nedá sa konvertovať starý adresár, ale boli vytvorené prázdne súbory nového "
 "adresára."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Nedá sa konvertovať starý adresár, nedajú sa ani vytvoriť súbory nového "
 "adresára."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Nedá sa konvertovať starý adresár a nedajú sa ani vytvoriť súbory nového "
 "adresára."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Ovládanie"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresár"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -3216,16 +3216,16 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "už beží iná kópia Sylpheedu.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Nastavenie akcií"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/sl.po b/po/sl.po
index 3d91d6d7..15251cc1 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2003-01-24 20:39CET\n"
 "Last-Translator: Jernej Kovacic <jkovacic@email.si>\n"
 "Language-Team: Slovenian <translator-team-sl@lists.sourceforge.net>\n"
@@ -137,82 +137,82 @@ msgstr "med dobivanjem ovojnice je prišlo do napake.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "ne morem razčleniti ovojnice: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "ne morem dobiti ovojnice\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne morem se povezati s strežnikom IMAP4: %s%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ne morem vzpostaviti seje IMAP4 z: %s%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "ne morem dobiti imenskega prostora\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne morem izbrati mape: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Overovitvena metoda"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "Prijava na IMAP4 ni uspela.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne morem pripeti %s na %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(pošiljam datoteko...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne morem dodati sporočila %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne morem kopirati %d na %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "napaka med IMAPovim ukazom: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne more pretvoriti UTF-7 v %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne more pretvoriti %s v UTF-7\n"
@@ -689,7 +689,7 @@ msgstr ""
 "Nova sporočila bodo iskana v tem vrstnem redu. Označite izbirnike\n"
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -830,7 +830,7 @@ msgstr "Dodaj naslov v adresar"
 msgid "Address"
 msgstr "Naslov"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Opombe"
@@ -839,29 +839,29 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _Knjiga"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _v kartica"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Nov _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -869,101 +869,101 @@ msgstr "/_Datoteka/Nov _strežnik"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Urejanje"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Brisanje"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Naslov"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Naslov/Nov n_aslov"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Naslov/Nova _skupina"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Naslov/Nova _mapa"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Naslov/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Naslov/_Urejanje"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Nov n_aslov"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Nova _skupina"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -976,88 +976,88 @@ msgstr "/Nova _mapa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Brisanje"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Prepiš_i..."
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Imenik naslovov"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Mapa"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kp:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Skp:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Izbriši"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Dodajanje"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Poišči"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "Zapri"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Brisanje naslova"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Res želite izbrisati naslov(e)?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1066,38 +1066,38 @@ msgstr ""
 "Ali res želite izbrisati mapo IN vse naslove v '%s' ? \n"
 "Če izbrišete samo mapo, se bodo vsi naslovi prestavili v starševsko mapo."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo mapa"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mapa in naslovi"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Res želite izbrisati '%s' ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Nov uporabnik, ne morem shraniti indeksne datoteke."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Nov uporabnik, ne morem shraniti datotek z iminiki naslovov."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Star imenik naslovov je bil uspešno pretvorjen."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1105,7 +1105,7 @@ msgstr ""
 "Stari imenik naslovov pretvorjen,\n"
 "ne morem shraniti nove indeksne datoteke naslovov"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1113,7 +1113,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "sem pa naredil prazne nove datoteke imenikov naslovov."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1121,7 +1121,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "ne morem narediti novih datotek z imeniki naslovov."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1129,17 +1129,17 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov\n"
 "in ne morem narediti novih datotek z imeniki naslovov"
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Pretvarjam imenik naslovov"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1147,80 +1147,80 @@ msgid ""
 "%s%c%s"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Napaka v imeniku naslovov"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Star imenik naslovov pretvorjen, ne morem shraniti nove indeksne datoteke "
 "naslovov"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Ne morem pretvoriti imenika naslovov, sem pa naredil prazno datoteko z "
 "imenikom naslovov."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Ne morem pretvoriti imenika naslovov, ne morem narediti novih datotek z "
 "imeniki naslovov."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Ne morem pretvoriti imenika naslovov in ne morem narediti novih datotek."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Oseba"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "v-kartica"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "Strežnik LDAP"
 
@@ -3214,16 +3214,16 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed že teče.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem nastavitve dejanj..\n"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/sr.po b/po/sr.po
index 87a9e495..bfd1b5e4 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -138,82 +138,82 @@ msgstr "došlo je do greške prilikom dobijanja omota.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "ne mogu analizirati omot: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "ne mogu dobiti omot\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne mogu se povezati sa IMAP4 serverom: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ne mogu se povezati s IMAP4 serverom: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "ne mogu dobiti namespace\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne mogu odabrati direktorijum: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Način provere identieta"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login nije uspeo.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu dodati %s na %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(šaljem datoteku...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu dodati poruku %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "grečka prilikom imap naredbe: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne može prebaciti UTF-7 to %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne može prebaciti %s to UTF-7\n"
@@ -689,7 +689,7 @@ msgstr ""
 "Nove poruke biti će proveravane ovim redom. Označite pod\n"
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -830,7 +830,7 @@ msgstr "Dodaj adresu u adresar"
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Beleške"
@@ -839,29 +839,29 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _server"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -869,101 +869,101 @@ msgstr "/_Datoteka/Novi _server"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Izmeni"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _direktorijum"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Izmeni"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -976,88 +976,88 @@ msgstr "/Novi _direktorijum"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiranje..."
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresar"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Direktorijum"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Potraži"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "Zatvori"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Zaista obrisati adresu/e?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1067,38 +1067,38 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo direktorijum"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Direktorijum i adrese"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Zaista obrisati `%s' ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu sačuvati index datoteku."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu sačuvati datoteke adresara."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspešno prebačen."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1106,7 +1106,7 @@ msgstr ""
 "Stari adresar ne može biti prebačen,\n"
 "ne mogu sačuvati novu index datoteku adresara."
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1114,7 +1114,7 @@ msgstr ""
 "Ne mogu prebaciti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1122,7 +1122,7 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1130,17 +1130,17 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Prebacivanje adresara"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1148,73 +1148,73 @@ msgid ""
 "%s%c%s"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr "Stari adresar unešen, ne mogu napraviti index datoteke novih adresa"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Ne mogu uneti adresar, pravim prazne datoteke novog adresara."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Ne mogu uneti adresar, ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Ne mogu uneti adresar i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Izgled programa"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -3208,16 +3208,16 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pisanje konfiguracije za akcije...\n"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/sv.po b/po/sv.po
index f1b97024..2a0e7073 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -134,79 +134,79 @@ msgstr "fel uppstod vid hämtning av kuvert.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "kan inte tolka kuvert: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "kan inte hämta kuvert\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan inte ansluta till IMAP4-server: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kan inte skapa IMAP4-session med: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "kan inte hämta namnutrymme\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan inte välja mapp: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "fel vid imapkommando: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-autentisering misslyckades.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-inloggning misslyckades.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan inte lägga till %s till %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(skickar fil...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kan inte lägga till meddelande till %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan inte kopiera %s till %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fel vid imapkommando: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fel vid imapkommando: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "fel vid imapkommando: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan inte konvertera UTF-7 till %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan inte konvertera %s till UTF-7\n"
@@ -686,7 +686,7 @@ msgstr ""
 "Markera rutorna i `G'-kolumnen för att aktivera meddelandehämtning\n"
 "via \"Hämta alla\""
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -827,7 +827,7 @@ msgstr "Lägg till i adressbok"
 msgid "Address"
 msgstr "Adress"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Kommentarer"
@@ -836,29 +836,29 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arkiv"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Arkiv/Ny _bok"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Arkiv/Nytt _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Arkiv/Ny _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arkiv/Ny _Server"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -866,101 +866,101 @@ msgstr "/_Arkiv/Ny _Server"
 msgid "/_File/---"
 msgstr "/_Arkiv/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Arkiv/_Redigera"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Arkiv/_Ta bort"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigera"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/A_dress"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/A_dress/Ny _adress"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/A_dress/Ny _grupp"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/A_dress/Ny _mapp"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/A_dress/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/A_dress/_Redigera"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/V_erktyg"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Ny _adress"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Ny _grupp"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -973,88 +973,88 @@ msgstr "/Ny _mapp"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Ta bort"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiera..."
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressbok"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Mapp"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Till:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Dold kopia:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Slå upp"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "Stäng"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Ta bort adress(er)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Vill du verkligen ta bort adress(erna)?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1064,36 +1064,36 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "_Endast mapp"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Mapp och _adresser"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Vill du verkligen ta bort \"%s\" ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Ny användare, kunde inte spara indexfil."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Ny användare, kunde inte spara adressboksfiler."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Den gamla adressboken är konverterad."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1101,7 +1101,7 @@ msgstr ""
 "Gammal adressbok konverterad,\n"
 "kunde inte spara ny adressindexfil"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1109,7 +1109,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1117,7 +1117,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1125,17 +1125,17 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1143,75 +1143,75 @@ msgid ""
 "%s%c%s"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adressboksfel"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr "Gammal adressbok konverterad, kunde inte skapa ny adressindexfil"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Kunde inte konvertera adressbok, men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Kunde inte konvertera adressbok, kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Kunde inte konvertera adressbok och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Grupp"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
@@ -3176,15 +3176,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "en annan instans av Sylpheed är redan igång.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Migration av konfiguration"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/tr.po b/po/tr.po
index d7e31e5f..c5929e27 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2004-12-03 11:44+0200\n"
 "Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
 "Language-Team:  <gnome-turk@gnome.org>\n"
@@ -140,80 +140,80 @@ msgstr "zarf alınırken bir hata oluştu.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "zarf ayrıştırılamadı: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "zarf alınamadı\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 oturumuna %s:%d ile bağlantı kurulamadı\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "alanadına erişilemedi\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "dizin seçilemedi: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 yetkilendirmesi başarısız.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 girişinde hata.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s, %s üzerine eklenemedi\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(dosya gönderiliyor...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "ileti %s'ye eklenemiyor\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s, %s konumuna kopyalanamadı\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap komutu sırasında hata oluştu: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "EXPUNGE komutu sırasında hata oluştu\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv, UTF-7 yi %s'e çeviremedi\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv %s yi UTF-7'ye çeviremedi\n"
@@ -684,7 +684,7 @@ msgstr ""
 "kutucukları tıklanarak bu hesaplar için `Hepsini al' seçeneğini \n"
 "etkin duruma getirilebilir."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -827,7 +827,7 @@ msgstr "Adres Defterine Ekle"
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Notlar"
@@ -836,29 +836,29 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Dosya"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Dosya/Yeni _Defter"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Dosya/Yeni _vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Dosya/Yeni _JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Dosya/Yeni _Sunucu"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -866,101 +866,101 @@ msgstr "/_Dosya/Yeni _Sunucu"
 msgid "/_File/---"
 msgstr "/_Dosya/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Dosya/_Düzenle"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Dosya/_Sil"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Yeni _Adres"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Yeni _Grup"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Yeni _Dizin"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/_Adres/Dü_zenle"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/A_raçlar"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Yeni _Adres"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Yeni _Grup"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -973,88 +973,88 @@ msgstr "/Yeni _Dizin"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Sil"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopyala..."
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adres defteri"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Dizin"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "İsim:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Kime:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Sil"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Ekle"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Ara"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "Kapat"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Adres(ler)i sil"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Adres(ler) silinsin mi?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1064,38 +1064,38 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Dizini sil"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "_Folder only"
 msgstr "Sadece dizin"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Dizin ve Adresler"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "`%s' silinsin mi?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Yeni kullanıcı, indeks dosyası kaydedilemedi."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Yeni kullanıcı, adres defteri dosyaları kaydedilemedi."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Eski adres defteri başarıyla çevrildi."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1103,7 +1103,7 @@ msgstr ""
 "Eski adres defteri çevrildi,\n"
 "yeni adres indeks dosyası kaydedilemedi"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1111,7 +1111,7 @@ msgstr ""
 "Adres defteri çevrilemedi,\n"
 "ancak boş bir adres defteri dosyası oluşturuldu."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1119,7 +1119,7 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1127,17 +1127,17 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adres defteri çevrimi"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1145,78 +1145,78 @@ msgid ""
 "%s%c%s"
 msgstr "Adres indeksi okunamadı"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adres Defteri Hatası"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Eski adres defteri çevrildi, ancak yeni adres indeks dosyası kaydedilemedi"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Adres defteri çevrilemedi, ancak yeni ve boş bir adres defteri dosyası "
 "oluşturuldu."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Adres defteri çevrilemedi ve yeni adres defteri dosyası oluşturulamadı."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Adres defteri çevrilemedi ve yeni adres defteri dosyası oluşturulamadı."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Adres indeksi okunamadı"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adres Defteri Çevrim Hatası"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Arayüz"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adres Defteri"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Kişi"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "İleti Adresi"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Grup"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP Sunucu"
 
@@ -3202,16 +3202,16 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "Başka bir Sylpheed sistemde çalışıyor.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Eylem ayarları"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/uk.po b/po/uk.po
index ba9aa9a6..808ca090 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2009-10-12 23:57+0300\n"
 "Last-Translator: O.R. Nykyforchyn <oleh.nyk@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -139,79 +139,79 @@ msgstr "трапилась помилка при отриманні конвер
 msgid "can't parse envelope: %s\n"
 msgstr "не вдалось розібрати конверт: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "не вдалось отримати конверт\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не вдалось встановити сесію IMAP4 з: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "не вдалось отримати простір імен\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не вдалось отримати папку: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "помилка при виконанні команди imap: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "Невдача авторизації IMAP4.\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "Невдача авторизації IMAP4.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не вдалось додати %s до %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(посилаємо файл...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не вдалось приєднати лист до %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не вдалось скопіювати %s в %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "помилка при виконанні команди imap:  STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "помилка при виконанні команди imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "помилка при виконанні команди imap: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може конвертувати UTF-7 в %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може конвертувати %s в UTF-7\n"
@@ -689,7 +689,7 @@ msgstr ""
 "Порядок перевірки нових листів. Позначте в колонці `G'\n"
 "account'и, які поповнюються через `Отримати всі'."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -830,7 +830,7 @@ msgstr "Додати адресу до книги"
 msgid "Address"
 msgstr "Адреса"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Нотатки"
@@ -839,28 +839,28 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/Файл/Нова книга"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/Файл/Нова vCard"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новий JPilot"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новий сервер LDAP"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -868,100 +868,100 @@ msgstr "/Файл/Новий сервер LDAP"
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/Файл/Редагувати"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/Файл/Видалити"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Редагувати"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/Редагувати/Вставити"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/Адреса"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/Адреса/Нова адреса"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/Адреса/Нова група"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/Адреса/Нова папка"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/Адреса/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/Адреса/Редагувати"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Інструменти"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 msgid "/_Tools/Import _CSV file"
 msgstr "/Інструменти/Імпортувати файл CSV"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Нова адреса"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/Нова група"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Нова папка"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -974,85 +974,85 @@ msgstr "/Нова папка"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/Видалити"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 msgid "/_Copy"
 msgstr "/Копіювати"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 msgid "/_Paste"
 msgstr "/Вставити"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресна книга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Ім'я:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Приховано:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Видалити"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Додати"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Пошук"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 msgid "_Close"
 msgstr "Закрити"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Видалити адресу(и)"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Дійсно видалити адресу(и)?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1061,36 +1061,36 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Видалити папку"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "Тільки папку"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Папку та адреси"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Дійсно видалити `%s' ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Новий користувач, не вдалось зберегти покажчик."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Новий користувач, не вдалось зберегти адресну книгу."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Стару адресну книгу успішно конвертовано."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1098,7 +1098,7 @@ msgstr ""
 "Стару адресну книгу конвертовано,\n"
 "не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1106,7 +1106,7 @@ msgstr ""
 "Не вдалось конвертувати адресну книгу,\n"
 "але створено нову (порожню)."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1114,7 +1114,7 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1122,15 +1122,15 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 msgid "Address book conversion error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 msgid "Address book conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1138,71 +1138,71 @@ msgid ""
 "%s%c%s"
 msgstr "Не вдалось прочитати покажчик адрес"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 msgid "Address Book Error"
 msgstr "Помилка в адресній книзі"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Стару адресну книгу конвертовано, не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Не вдалось конвертувати адресну книгу, але створено нову (порожню)."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Не вдалось прочитати покажчик адрес"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 msgid "Address Book Conversion Error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 msgid "Address Book Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Особа"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Група"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -3116,15 +3116,15 @@ msgid "Loading plug-ins..."
 msgstr "Завантажуємо плагіни..."
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "вже запущено інший Sylpheed.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Перенесення налаштувань"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/vi.po b/po/vi.po
index 32e5eea4..8ce5f266 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -134,79 +134,79 @@ msgstr "xảy ra lỗi khi lấy phong bì.\n"
 msgid "can't parse envelope: %s\n"
 msgstr "không thể phân tích phong bì: %s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "không thể lấy phong bì\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Không thể kết nối tới máy chủ IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Không thể tạo phiên IMAP4 với: %s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "không thể lấy khoảng định danh (namespace)\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "không thể chọn thư mục: %s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "có lỗi khi chạy lệnh imap: STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "Xác thực IMAP4 thất bại:\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "Đăng nhập IMAP4 thất bại.\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "không thể ghep %s vào %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(đang gửi tập tin...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "không thể ghép thư vào %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "không thể chép %s tới %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "có lỗi khi chạy lệnh imap: STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "có lỗi khi chạy lệnh imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "có lỗi khi chạy lệnh imap: CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv không thể chuyển UTF-7 sang %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv không thể chuyển %s sang UTF-7\n"
@@ -668,7 +668,7 @@ msgstr ""
 "Các thư mới sẽ được kiểm tra theo thứ tự này. Đánh dấu các hộp\n"
 "trên cột `G' để cho phép lấy thư về bằng `Lấy tất cả'."
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -809,7 +809,7 @@ msgstr "Thêm địa chỉ vào sổ"
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "Ghi chú"
@@ -818,28 +818,28 @@ msgstr "Ghi chú"
 msgid "Select Address Book Folder"
 msgstr "Chọn thư mục sổ địa chỉ"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Tập tin"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/_Tập tin/_Sổ mới"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/_Tập tin/_vCard mới"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/_Tập tin/_JPilot mới"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 msgid "/_File/New _LDAP Server"
 msgstr "/_Tập tin/_Máy chủ LDAP mới"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -847,101 +847,101 @@ msgstr "/_Tập tin/_Máy chủ LDAP mới"
 msgid "/_File/---"
 msgstr "/_Tập tin/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/_Tập tin/Soạ_n"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/_Tập tin/_Xoá"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/_Tập tin/_Lưu"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Tập tin/Đón_g"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Soạn"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Soạn/_Sao chép"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/_Soạn/_Dán"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/Đị_a chỉ"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/Đị_a chỉ/Địa chỉ _mới"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/Đị_a chỉ/_Nhóm mới"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/Đị_a chỉ/_Thư mục mới"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/Đị_a chỉ/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/Đị_a chỉ/_Soạn"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Công cụ"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hỗ trợ"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hỗ trợ/_Giới thiệu"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/Địa chỉ _mới"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/_Nhóm mới"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/Thư _mục mới"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -954,88 +954,88 @@ msgstr "/Thư _mục mới"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/_Xoá"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Sao chép"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Soạn/_Dán"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Thư mục"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "Tên:"
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Người nhận:"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Xoá"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "Thêm"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "Tra cứu"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "Màu sắc"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "Xoá địa chỉ"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "Thực sự muốn xoá (các) địa chỉ này?"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1044,36 +1044,36 @@ msgstr ""
 "Bạn có muốn xoá thư mục VÀ mọi địa chỉ trong `%s' ?\n"
 "Nếu chỉ xoá thư mục, các địa chỉ sẽ được chuyển đến thư mục cấp cao hơn."
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "_Chỉ thư mục"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "Thư mục và địa c_hỉ"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Thực sự muốn xoá `%s' ?"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "Người dùng mới, không thể lưu tập tin mục lục."
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "Người dùng mới, không thể lưu các tập tin sổ địa chỉ."
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "Sổ địa chỉ cũ đã được chuyển đổi thành công."
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1081,7 +1081,7 @@ msgstr ""
 "Sổ địa chỉ cũ đã được chuyển,\n"
 "không thể lưu tập tin địa chỉ mới"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1089,7 +1089,7 @@ msgstr ""
 "Không thể chuyển đổi sổ địa chỉ,\n"
 "nhưng đã tạo các tập tin sổ địa chỉ trống mới."
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1097,7 +1097,7 @@ msgstr ""
 "Không thể chuyển đổi sổ địa chỉ,\n"
 "không thể tạo các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1105,17 +1105,17 @@ msgstr ""
 "Không thể chuyển đổi sổ địa chỉ\n"
 "và không thể các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1123,78 +1123,78 @@ msgid ""
 "%s%c%s"
 msgstr "Không thể đọc mục lục địa chỉ"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Lỗi sổ địa chỉ"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Sổ địa chỉ cũ đã được chuyển đổi, không thể lưu tập tin mục lục địa chỉ mới"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Không thể chuyển đổi sổ địa chỉ, nhưng đã tạo các tập tin sổ địa chỉ trống "
 "mới."
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Không thể chuyển đổi sổ địa chỉ, không thể tạo các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Không thể chuyển đổi sổ địa chỉ và không thể tạo các tập tin sổ địa chỉ mới."
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "Không thể đọc mục lục địa chỉ"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "Giao diện"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "Cá nhân"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "Nhóm"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "Máy chủ LDAP"
 
@@ -3147,15 +3147,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "một tiến trình Sylpheed khác đang chạy.\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "Di trú cấu hình"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a9d81af3..018fc361 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -136,80 +136,80 @@ msgstr "获取信封时发生错误。\n"
 msgid "can't parse envelope: %s\n"
 msgstr "无法解析信封：%s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "无法获取信封\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "无法获得名字空间\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "无法选择文件夹：%s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "执行IMAP命令时发生错误：CLOSE\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 验证失败。\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登录失败。\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "无法把 %s 添加到 %s\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "(正在发送文件...)"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "无法追加邮件到 %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "无法将 %s 复制到 %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "执行IMAP命令时发生错误：STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "执行IMAP命令时发生错误：EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "执行IMAP命令时发生错误：CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv 无法转换 UTF-7 到 %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv 无法转换 %s 到 UTF-7\n"
@@ -678,7 +678,7 @@ msgstr ""
 "按照该顺序检查新邮件。选中“G”列的复选框，在“全部接收”\n"
 "时会检查新邮件。"
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -821,7 +821,7 @@ msgstr "将地址添加到地址簿"
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "注释"
@@ -830,29 +830,29 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/文件(_F)/新建地址簿(_B)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/文件(_F)/新建 vCard(_V)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/文件(_F)/新建 JPilot(_J)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -860,101 +860,101 @@ msgstr "/文件(_F)/新建服务器(_S)"
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/文件(_F)/编辑(_E)"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/文件(_F)/删除(_D)"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新建地址(_A)"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新建组(_G)"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新建文件夹(_F)"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/新建地址(_A)"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/新建组(_G)"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -967,88 +967,88 @@ msgstr "/新建文件夹(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/复制(_C)..."
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "地址簿"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "文件夹"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件抄送："
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "删除"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "添加"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "查找"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "关闭"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "删除地址"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "真的要删除地址？"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1057,38 +1057,38 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "_Folder only"
 msgstr "仅文件夹"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "文件夹和地址"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "真的要删除“%s”？"
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "新建用户，无法保存索引文件。"
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "新建用户，无法保存地址簿文件。"
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr "成功转换旧的地址簿。"
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1096,7 +1096,7 @@ msgstr ""
 "已经转换旧的地址簿，\n"
 "无法保存新的地址索引文件"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1104,7 +1104,7 @@ msgstr ""
 "无法转换地址簿，\n"
 "但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1112,23 +1112,23 @@ msgstr ""
 "无法转换地址簿，\n"
 "无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1136,73 +1136,73 @@ msgid ""
 "%s%c%s"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "地址簿错误"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr "已经转换旧的地址簿，无法保存新的地址索引文件"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "无法转换地址簿，但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "无法转换地址簿，无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "地址簿"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "个人"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "群组"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
@@ -3162,15 +3162,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "另外一个 Sylpheed 正在运行。\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "正在迁移配置"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f1d27d45..a183e335 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -136,79 +136,79 @@ msgstr "取得信封時發生錯誤。\n"
 msgid "can't parse envelope: %s\n"
 msgstr "無法解析信封：%s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "無法取得信封。\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "無法連線到 IMAP4 伺服器：%s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "無法產生 IMAP4 連線：%s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "無法取得信封。\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾：%s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "發生錯誤的 imap 命令： STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 認證失敗\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登入失敗。\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "無法將郵件從 %s 搬移到 %s。\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "（送出檔案 ...）"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "無法附加訊息到 %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "無法將郵件 %s 移到 %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 發生錯誤，命令為： STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 發生錯誤，命令為： EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 發生錯誤，命令為： CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "無法將 UTF-7 轉換為 %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "無法轉換 %s 為 UTF-7\n"
@@ -683,7 +683,7 @@ msgstr ""
 "檢查新郵件時將會依照下面的順序。您可以勾選 G 欄位中的方塊，\n"
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -824,7 +824,7 @@ msgstr "將地址加入通訊錄"
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "備註"
@@ -833,29 +833,29 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/檔案(_F)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/檔案(_F)/新增通訊錄(_B)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/檔案(_F)/新增vCard(_V)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/檔案(_F)/新增J-Pilot(_J)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -863,101 +863,101 @@ msgstr "/檔案(_F)/新增伺服器(_S)"
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/檔案(_F)/編輯(_E)"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/檔案(_F)/刪除(_D)"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群組(_G)"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新增資料夾(_F)"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/編輯(_E)"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/新增地址(_A)"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/新增群組(_G)"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -970,88 +970,88 @@ msgstr "/新增資料夾(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/刪除(_D)"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/複製(_C)..."
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "通訊錄"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "資料夾"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "收件人"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "副本"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件副本"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "刪除"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "新增"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "尋找"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "顏色"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "刪除通訊紀錄"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "您確定要刪除這些紀錄嗎？"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1060,38 +1060,38 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "只刪除資料夾(_F)"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "全部刪除(_A)"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "您確定要刪除「%s」? "
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "無法儲存索引檔案。"
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "無法儲存通訊錄檔案。"
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr ""
 "轉換舊通訊錄格式完成。\n"
 "您可以開始使用新的通訊錄。"
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1099,7 +1099,7 @@ msgstr ""
 "舊通訊錄格式已轉換，\n"
 "但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1107,7 +1107,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1115,7 +1115,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1123,17 +1123,17 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1141,73 +1141,73 @@ msgid ""
 "%s%c%s"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "通訊錄發生錯誤"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr "舊通訊錄格式已轉換，但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "無法轉換通訊錄格式，但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "介面"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "人名"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "電子郵件信箱"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "群組"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP 伺服器"
 
@@ -3160,15 +3160,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "已經有 Sylpheed 程式正在執行中。\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "設定資料轉移"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
diff --git a/src/icons/sylpheed.ico b/src/icons/sylpheed.ico
index ee489664..f7cd1f8c 100644
--- a/src/icons/sylpheed.ico
+++ b/src/icons/sylpheed.ico
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2009-11-16 06:22:44 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2009-11-16 06:22:44 +0000
commit	d216d4d51ce9e34129d4c6fbf5c9ff91ea6cf75e (patch)
tree	d73c56e64afb1a884bc84e9c7abf663e92acbe2d
parent	722da9ea2d6849dbb4548c33c0946bbc7db11872 (diff)