Index: evolution/mail/em-account-editor.c
===================================================================
--- evolution/mail/em-account-editor.c	(revision 34451)
+++ evolution/mail/em-account-editor.c	(working copy)
@@ -112,6 +112,7 @@
 	struct _GtkComboBox *providers;
 
 	struct _GtkLabel *description;
+	struct _GtkLabel *portdesc;
 	struct _GtkLabel *hostlabel;
 	struct _GtkEntry *hostname;
 	struct _GtkLabel *userlabel;
@@ -1072,6 +1073,7 @@
 
 	char *container;
 	char *description;
+	char *portdesc;
 	char *hostname;
 	char *hostlabel;
 	char *username;
@@ -1097,7 +1099,7 @@
 } emae_service_info[CAMEL_NUM_PROVIDER_TYPES] = {
 	{ E_ACCOUNT_SOURCE_URL, E_ACCOUNT_SOURCE_SAVE_PASSWD,
 	  "source_frame", "source_type_dropdown",
-	  "source_vbox", "source_description", "source_host", "source_host_label", "source_user", "source_user_label", "source_path", "source_path_label", "source_path_entry",
+	  "source_vbox", "source_description","source_portdesc", "source_host", "source_host_label", "source_user", "source_user_label", "source_path", "source_path_label", "source_path_entry",
 	  "source_security_frame", "source_ssl_hbox", "source_use_ssl", "source_ssl_disabled",
 	  NULL, "source_auth_frame",
 	  "source_auth_dropdown", "source_check_supported",
@@ -1106,7 +1108,7 @@
 	},
 	{ E_ACCOUNT_TRANSPORT_URL, E_ACCOUNT_TRANSPORT_SAVE_PASSWD,
 	  "transport_frame", "transport_type_dropdown",
-	  "transport_vbox", "transport_description", "transport_host", "transport_host_label", "transport_user", "transport_user_label", NULL, NULL, NULL,
+	  "transport_vbox", "transport_description","transport_portdesc", "transport_host", "transport_host_label", "transport_user", "transport_user_label", NULL, NULL, NULL,
 	  "transport_security_frame", "transport_ssl_hbox", "transport_use_ssl", "transport_ssl_disabled",
 	  "transport_needs_auth", "transport_auth_frame",
 	  "transport_auth_dropdown", "transport_check_supported",
@@ -1263,6 +1265,7 @@
 
 		camel_url_set_protocol(url, service->provider->protocol);
 		gtk_label_set_text(service->description, service->provider->description);
+		gtk_label_set_text(service->portdesc, service->provider->portdesc);
 		if (!emae_check_license(service->emae, service->provider))
 			gtk_widget_hide(service->frame);
 		else
@@ -1346,6 +1349,7 @@
 	} else {
 		camel_url_set_protocol(url, NULL);
 		gtk_label_set_text(service->description, "");
+		gtk_label_set_text(service->portdesc, "");
 		gtk_widget_hide(service->frame);
 		gtk_widget_hide(service->auth_frame);
 		gtk_widget_hide(service->ssl_frame);
@@ -1638,6 +1642,7 @@
 	service->frame = glade_xml_get_widget(xml, info->frame);
 	service->container = glade_xml_get_widget(xml, info->container);
 	service->description = GTK_LABEL (glade_xml_get_widget (xml, info->description));
+	service->portdesc = GTK_LABEL (glade_xml_get_widget (xml, info->portdesc));
 	service->hostname = GTK_ENTRY (glade_xml_get_widget (xml, info->hostname));
 	service->hostlabel = (GtkLabel *)glade_xml_get_widget (xml, info->hostlabel);
 	service->username = GTK_ENTRY (glade_xml_get_widget (xml, info->username));
@@ -2470,6 +2475,7 @@
 	return w;
 }
 
+
 /* plugin meta-data for "org.gnome.evolution.mail.config.accountDruid" */
 static EMConfigItem emae_druid_items[] = {
 	{ E_CONFIG_DRUID, "", },
Index: evolution/mail/mail-config.glade
===================================================================
--- evolution/mail/mail-config.glade	(revision 34451)
+++ evolution/mail/mail-config.glade	(working copy)
@@ -550,8 +550,8 @@
 			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <accessibility>
+				<atkrelation target="label464" type="labelled-by"/>
 				<atkrelation target="identity_address_label" type="labelled-by"/>
-				<atkrelation target="label464" type="labelled-by"/>
 			      </accessibility>
 			    </widget>
 			    <packing>
@@ -633,8 +633,8 @@
 			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <accessibility>
+				<atkrelation target="identity_full_name_label" type="labelled-by"/>
 				<atkrelation target="label464" type="labelled-by"/>
-				<atkrelation target="identity_full_name_label" type="labelled-by"/>
 			      </accessibility>
 			    </widget>
 			    <packing>
@@ -836,8 +836,8 @@
 			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
+			    <atkrelation target="label466" type="labelled-by"/>
 			    <atkrelation target="identity_organization_label" type="labelled-by"/>
-			    <atkrelation target="label466" type="labelled-by"/>
 			  </accessibility>
 			</widget>
 			<packing>
@@ -890,8 +890,8 @@
 			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			  <accessibility>
+			    <atkrelation target="reply_to_label" type="labelled-by"/>
 			    <atkrelation target="label466" type="labelled-by"/>
-			    <atkrelation target="reply_to_label" type="labelled-by"/>
 			  </accessibility>
 			</widget>
 			<packing>
@@ -1193,8 +1193,8 @@
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
 			  <property name="wrap">False</property>
 			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
+			  <property name="xalign">0.490000009537</property>
+			  <property name="yalign">0.479999989271</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
@@ -1221,7 +1221,7 @@
 			  <child>
 			    <widget class="GtkTable" id="table4">
 			      <property name="visible">True</property>
-			      <property name="n_rows">3</property>
+			      <property name="n_rows">4</property>
 			      <property name="n_columns">2</property>
 			      <property name="homogeneous">False</property>
 			      <property name="row_spacing">6</property>
@@ -1249,8 +1249,8 @@
 				<packing>
 				  <property name="left_attach">0</property>
 				  <property name="right_attach">1</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
 				  <property name="x_options">fill</property>
 				  <property name="y_options"></property>
 				</packing>
@@ -1278,8 +1278,8 @@
 				<packing>
 				  <property name="left_attach">0</property>
 				  <property name="right_attach">1</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
 				  <property name="x_options">fill</property>
 				  <property name="y_options"></property>
 				</packing>
@@ -1300,8 +1300,8 @@
 				<packing>
 				  <property name="left_attach">1</property>
 				  <property name="right_attach">2</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
@@ -1321,8 +1321,8 @@
 				<packing>
 				  <property name="left_attach">1</property>
 				  <property name="right_attach">2</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
@@ -1348,8 +1348,8 @@
 				<packing>
 				  <property name="left_attach">0</property>
 				  <property name="right_attach">1</property>
-				  <property name="top_attach">2</property>
-				  <property name="bottom_attach">3</property>
+				  <property name="top_attach">3</property>
+				  <property name="bottom_attach">4</property>
 				  <property name="x_options">fill</property>
 				  <property name="y_options"></property>
 				</packing>
@@ -1368,11 +1368,39 @@
 				<packing>
 				  <property name="left_attach">1</property>
 				  <property name="right_attach">2</property>
-				  <property name="top_attach">2</property>
-				  <property name="bottom_attach">3</property>
+				  <property name="top_attach">3</property>
+				  <property name="bottom_attach">4</property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="source_portdesc">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">portdesc</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">True</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -2018,7 +2046,7 @@
 				  <child>
 				    <widget class="GtkTable" id="table6">
 				      <property name="visible">True</property>
-				      <property name="n_rows">1</property>
+				      <property name="n_rows">2</property>
 				      <property name="n_columns">2</property>
 				      <property name="homogeneous">False</property>
 				      <property name="row_spacing">6</property>
@@ -2046,8 +2074,8 @@
 					<packing>
 					  <property name="left_attach">0</property>
 					  <property name="right_attach">1</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
+					  <property name="top_attach">1</property>
+					  <property name="bottom_attach">2</property>
 					  <property name="x_options">fill</property>
 					  <property name="y_options"></property>
 					</packing>
@@ -2068,8 +2096,36 @@
 					<packing>
 					  <property name="left_attach">1</property>
 					  <property name="right_attach">2</property>
+					  <property name="top_attach">1</property>
+					  <property name="bottom_attach">2</property>
+					  <property name="y_options"></property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkLabel" id="transport_portdesc">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">portdesc</property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">True</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0</property>
+					  <property name="yalign">0</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="left_attach">1</property>
+					  <property name="right_attach">2</property>
 					  <property name="top_attach">0</property>
 					  <property name="bottom_attach">1</property>
+					  <property name="x_options">fill</property>
 					  <property name="y_options"></property>
 					</packing>
 				      </child>
@@ -2802,7 +2858,7 @@
 				<widget class="Custom" id="sent_button">
 				  <property name="visible">True</property>
 				  <property name="creation_function">em_account_editor_folder_selector_button_new</property>
-				  <property name="string1" translatable="yes">Select Sent Folder</property>
+				  <property name="string1">Select Sent Folder</property>
 				  <property name="int1">0</property>
 				  <property name="int2">0</property>
 				  <property name="last_modification_time">Tue, 14 Dec 2004 17:07:09 GMT</property>
@@ -2821,7 +2877,7 @@
 				<widget class="Custom" id="drafts_button">
 				  <property name="visible">True</property>
 				  <property name="creation_function">em_account_editor_folder_selector_button_new</property>
-				  <property name="string1" translatable="yes">Select Drafts Folder</property>
+				  <property name="string1">Select Drafts Folder</property>
 				  <property name="int1">0</property>
 				  <property name="int2">0</property>
 				  <property name="last_modification_time">Tue, 14 Dec 2004 17:07:02 GMT</property>
Index: evolution-data-server/camel/camel-provider.c
===================================================================
--- evolution-data-server/camel/camel-provider.c	(revision 8168)
+++ evolution-data-server/camel/camel-provider.c	(working copy)
@@ -62,6 +62,7 @@
 	N_("Virtual folder email provider"),
 	
 	N_("For reading mail as a query of another set of folders"),
+	N_(" "),
 	
 	"vfolder",
 	
@@ -246,6 +247,7 @@
 
 	provider->name = P_(provider->name);
 	provider->description = P_(provider->description);
+	provider->portdesc = P_(provider->portdesc);
 	conf = provider->extra_conf;
 	if (conf) {
 		for (i=0;conf[i].type != CAMEL_PROVIDER_CONF_END;i++) {
Index: evolution-data-server/camel/camel-provider.h
===================================================================
--- evolution-data-server/camel/camel-provider.h	(revision 8168)
+++ evolution-data-server/camel/camel-provider.h	(working copy)
@@ -160,6 +160,7 @@
 	 */
 	char *description;
 	
+	char *portdesc;
 	/* The category of message that this provider works with.
 	 * (evolution-mail will only list a provider in the store/transport
 	 * config dialogs if its domain is "mail".)
Index: evolution-data-server/camel/providers/local/camel-local-provider.c
===================================================================
--- evolution-data-server/camel/providers/local/camel-local-provider.c	(revision 8168)
+++ evolution-data-server/camel/providers/local/camel-local-provider.c	(working copy)
@@ -54,6 +54,7 @@
 	"mh",
 	N_("MH-format mail directories"),
 	N_("For storing local mail in MH-like mail directories."),
+	N_(" "),
 	"mail",
 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
 	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
@@ -72,6 +73,7 @@
 	"mbox",
 	N_("Local delivery"),
 	N_("For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."),
+	N_(" "),
 	"mail",
 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
 	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR |CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
@@ -94,6 +96,7 @@
 	"maildir",
 	N_("Maildir-format mail directories"),
 	N_("For storing local mail in maildir directories."),
+	N_(" "),
 	"mail",
 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,
 	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
@@ -114,6 +117,7 @@
 	"spool",
 	N_("Standard Unix mbox spool file"),
 	N_("For reading and storing local mail in external standard mbox spool files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."),
+	N_(" "),
 	"mail",
 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
 	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
@@ -125,6 +129,7 @@
 	"spooldir",
 	N_("Standard Unix mbox spool directory"),
 	N_("For reading and storing local mail in external standard mbox spool files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."),
+	N_(" "),
 	"mail",
 	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
 	CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH,
Index: evolution-data-server/camel/providers/imap/camel-imap-provider.c
===================================================================
--- evolution-data-server/camel/providers/imap/camel-imap-provider.c	(revision 8168)
+++ evolution-data-server/camel/providers/imap/camel-imap-provider.c	(working copy)
@@ -82,6 +82,8 @@
 
 	N_("For reading and storing mail on IMAP servers."),
 
+	N_("You can also specify port number with server.\n for example:- mail.example.com:110.\nIf you don’t know port details,contact to your ISP or system administrator."),
+
 	"mail",
 
 	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE |
Index: evolution-data-server/camel/providers/smtp/camel-smtp-provider.c
===================================================================
--- evolution-data-server/camel/providers/smtp/camel-smtp-provider.c	(revision 8168)
+++ evolution-data-server/camel/providers/smtp/camel-smtp-provider.c	(working copy)
@@ -40,8 +40,9 @@
 
 	N_("For delivering mail by connecting to a remote mailhub "
 	   "using SMTP."),
+	N_("You can also specify port number with server.\n for example:- mail.example.com:25.\nIf you don’t know port details,contact to your ISP or system administrator."),
 
-	"mail",
+        "mail",
 
 	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_SUPPORTS_SSL,
 
Index: evolution-data-server/camel/providers/hula/camel-hula-provider.c
===================================================================
--- evolution-data-server/camel/providers/hula/camel-hula-provider.c	(revision 8168)
+++ evolution-data-server/camel/providers/hula/camel-hula-provider.c	(working copy)
@@ -78,6 +78,7 @@
 	N_("Hula"),
 
 	N_("For accessing Hula servers"),
+	N_(" "),
 
 	"mail",
 
Index: evolution-data-server/camel/providers/groupwise/camel-groupwise-provider.c
===================================================================
--- evolution-data-server/camel/providers/groupwise/camel-groupwise-provider.c	(revision 8168)
+++ evolution-data-server/camel/providers/groupwise/camel-groupwise-provider.c	(working copy)
@@ -89,6 +89,7 @@
 	N_("Novell GroupWise"),
 
 	N_("For accessing Novell GroupWise servers"),
+	N_(" "),
 
 	"mail",
 
Index: evolution-data-server/camel/providers/imap4/camel-imap4-provider.c
===================================================================
--- evolution-data-server/camel/providers/imap4/camel-imap4-provider.c	(revision 8168)
+++ evolution-data-server/camel/providers/imap4/camel-imap4-provider.c	(working copy)
@@ -66,6 +66,7 @@
 	N_("IMAP4rev1"),
 	
 	N_("For reading and storing mail on IMAPv4rev1 servers."),
+	N_("You can also specify port number with server.\n for example:- mail.example.com:110.\nIf you don’t know port details,contact to your ISP or system administrator."),
 	
 	"mail",
 	
Index: evolution-data-server/camel/providers/imapp/camel-imapp-provider.c
===================================================================
--- evolution-data-server/camel/providers/imapp/camel-imapp-provider.c	(revision 8168)
+++ evolution-data-server/camel/providers/imapp/camel-imapp-provider.c	(working copy)
@@ -51,6 +51,7 @@
 	N_("Experimental IMAP 4(.1) client\n"
 	   "This is untested and unsupported code, you want to use plain imap instead.\n\n"
 	   " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"),
+	N_("You can also specify port number with server.\n for example:- mail.example.com:110.\nIf you don’t know port details,contact to your ISP or system administrator."),
 	"mail",
 	
 	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE |
Index: evolution-data-server/camel/providers/pop3/camel-pop3-provider.c
===================================================================
--- evolution-data-server/camel/providers/pop3/camel-pop3-provider.c	(revision 8168)
+++ evolution-data-server/camel/providers/pop3/camel-pop3-provider.c	(working copy)
@@ -55,6 +55,7 @@
 	N_("POP"),
 	
 	N_("For connecting to and downloading mail from POP servers."),
+	N_("You can also specify port number with server.\n for example:- mail.example.com:110.\nIf you don’t know port details,contact to your ISP or system administrator."),
 	
 	"mail",
 	
Index: evolution-data-server/camel/providers/nntp/camel-nntp-provider.c
===================================================================
--- evolution-data-server/camel/providers/nntp/camel-nntp-provider.c	(revision 8168)
+++ evolution-data-server/camel/providers/nntp/camel-nntp-provider.c	(working copy)
@@ -56,6 +56,7 @@
 
 	N_("This is a provider for reading from and posting to "
 	   "USENET newsgroups."),
+	N_(" "),
 
 	"news",
 
Index: evolution-data-server/camel/providers/sendmail/camel-sendmail-provider.c
===================================================================
--- evolution-data-server/camel/providers/sendmail/camel-sendmail-provider.c	(revision 8168)
+++ evolution-data-server/camel/providers/sendmail/camel-sendmail-provider.c	(working copy)
@@ -39,6 +39,7 @@
 
 	N_("For delivering mail by passing it to the \"sendmail\" program "
 	   "on the local system."),
+	N_(" "),
 
 	"mail",
 
Index: evolution-exchange/camel/camel-exchange-provider.c
===================================================================
--- evolution-exchange/camel/camel-exchange-provider.c	(revision 1495)
+++ evolution-exchange/camel/camel-exchange-provider.c	(working copy)
@@ -87,6 +87,8 @@
 
 	N_("For handling mail (and other data) on Microsoft Exchange servers"),
 
+	N_(" "),
+
 	"mail",
 
 	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE |
