diff --git a/src/ChangeLog b/src/ChangeLog
index 0f4b9f1..42cbeb7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2008-09-02  Pablo Sanxiao  <psanxiao@gmail.com>
+
+	*profile.c:
+	(gtranslator_profile_xml_new_entry):
+	(gtranslator_profile_xml_get_entry):
+	Added charset_index to values to be saved in xml.
+	
+2008-09-02  Pablo Sanxiao  <psanxiao@gmail.com>
+
+	* profile.{ch}:
+        Added new attribute charset_index with methods set and get.
+        * dialogs/preferences-dialog.c:
+        Set "8bit" as default value in enconding text entry.
+        * dialogs/profile-dialog.c:
+        Changed the charset entry to ComboBox with values to choose.
+    
+        Improving the profiles dialog in order to do it less technical.
+
 2008-09-02  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
 	* tab.c: Message edition finished signal must not be
diff --git a/src/dialogs/preferences-dialog.c b/src/dialogs/preferences-dialog.c
index 8f9ebb5..e822738 100644
--- a/src/dialogs/preferences-dialog.c
+++ b/src/dialogs/preferences-dialog.c
@@ -945,6 +945,10 @@ add_button_pulsed (GtkWidget *button,
 {
   GtranslatorProfile *profile;
   profile = gtranslator_profile_new ();
+  /*
+   * Set default value for encoding
+   */
+  gtranslator_profile_set_encoding (profile, "8bit");
   gtranslator_show_profile_dialog(dlg, profile, NEW_PROFILE);
 }
 
diff --git a/src/dialogs/profile-dialog.c b/src/dialogs/profile-dialog.c
index 842aa68..588c410 100644
--- a/src/dialogs/profile-dialog.c
+++ b/src/dialogs/profile-dialog.c
@@ -33,6 +33,25 @@
 #include <gtk/gtk.h>
 #include <libxml/tree.h>
 
+const char *encodings[] =
+{
+	N_("UTF-8 (Unicode)"),
+	N_("ISO-8859-15 (Western Europe)"),
+	N_("ISO-8859-2 (Central Europe)"),
+	N_("ISO-8859-7 (Greek)"),
+	N_("ISO-8859-8 (Hebrew)"),
+	N_("ISO-8859-9 (Turkish)"),
+	N_("ISO-2022-JP (Japanese)"),
+	N_("SJIS (Japanese)"),
+	N_("CP949 (Korean)"),
+	N_("KOI8-R (Cyrillic)"),
+	N_("CP1251 (Cyrillic)"),
+	N_("CP1256 (Arabic)"),
+	N_("CP1257 (Baltic)"),
+	N_("GB18030 (Chinese)"),
+	N_("TIS-620 (Thai)"),
+	NULL
+};
 
 #define GTR_PROFILE_DIALOG_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 	(object),	\
@@ -51,9 +70,12 @@ struct _GtranslatorProfileDialogPrivate
 	GtkWidget *author_name_entry;
 	GtkWidget *author_email_entry;
 
+        GtkWidget *table;
+
 	GtkWidget *language_name_entry;
 	GtkWidget *language_code_entry;
-	GtkWidget *charset_entry;
+        GtkWidget *charset_combo;
+        GtkWidget *charset_entry;
 	GtkWidget *encoding_entry;
 	GtkWidget *language_email_entry;
 	GtkWidget *plurals_forms_entry;
@@ -155,18 +177,24 @@ language_code_entry_changed (GObject    *gobject,
 }
 
 static void
-charset_entry_changed (GObject    *gobject,
-		       GParamSpec *arg1,
+charset_combo_changed (GObject    *gobject,
 		       GtranslatorProfile *profile)
 {
-	const gchar *text;
-
+        gchar *text;
+	gchar **charset_array;
+	gint active;
+	
 	/*g_return_if_fail (GTK_ENTRY (gobject) == GTK_ENTRY (dlg->priv->profile_name_entry));*/
 
-	text = gtk_entry_get_text (GTK_ENTRY (gobject));
+	active = gtk_combo_box_get_active (GTK_COMBO_BOX (gobject));
 	
-	if (text)
-	  gtranslator_profile_set_charset (profile, (gchar *)text);
+	if (active ) {
+	  text = gtk_combo_box_get_active_text (GTK_COMBO_BOX (gobject));
+	  charset_array = g_strsplit (text, "(", 2);
+	  gtranslator_profile_set_charset (profile, charset_array[0]);
+	  gtranslator_profile_set_charset_index (profile, active);
+	  g_strfreev (charset_array);
+	}
 }
 
 static void
@@ -306,6 +334,7 @@ static void destroy_without_changes (GtkWidget *widget,
   gtranslator_profile_set_author_email (sdata->new_profile, gtranslator_profile_get_author_email (sdata->old_profile));
   gtranslator_profile_set_language_name (sdata->new_profile, gtranslator_profile_get_language_name (sdata->old_profile));
   gtranslator_profile_set_language_code (sdata->new_profile, gtranslator_profile_get_language_code (sdata->old_profile));
+  gtranslator_profile_set_charset_index (sdata->new_profile, gtranslator_profile_get_charset_index (sdata->old_profile));
   gtranslator_profile_set_charset (sdata->new_profile, gtranslator_profile_get_charset (sdata->old_profile));
   gtranslator_profile_set_encoding (sdata->new_profile, gtranslator_profile_get_encoding (sdata->old_profile));
   gtranslator_profile_set_group_email (sdata->new_profile, gtranslator_profile_get_group_email (sdata->old_profile));
@@ -318,7 +347,8 @@ static void gtranslator_profile_dialog_init (GtranslatorProfileDialog *dlg)
 {
 	gboolean ret;
 	GtkWidget *error_widget;
-	
+	gchar **enc;
+
 	dlg->priv = GTR_PROFILE_DIALOG_GET_PRIVATE (dlg);
 	
 	gtk_window_set_title (GTK_WINDOW (dlg), _("gtranslator Profile"));
@@ -338,7 +368,7 @@ static void gtranslator_profile_dialog_init (GtranslatorProfileDialog *dlg)
 		"email_entry", &dlg->priv->author_email_entry,
 		"language_entry", &dlg->priv->language_name_entry,
 		"langcode_entry", &dlg->priv->language_code_entry,
-		"charset_entry", &dlg->priv->charset_entry,
+		"table4", &dlg->priv->table,				  
 		"encoding_entry", &dlg->priv->encoding_entry,
 		"team_email_entry", &dlg->priv->language_email_entry,
 		"plurals_entry", &dlg->priv->plurals_forms_entry,
@@ -356,6 +386,17 @@ static void gtranslator_profile_dialog_init (GtranslatorProfileDialog *dlg)
 	gtk_widget_set_tooltip_text (dlg->priv->plurals_forms_entry,
 				     _("Example: nplurals=2; plural=(n != 1);"));
 
+	dlg->priv->charset_combo = gtk_combo_box_new_text ();
+	gtk_widget_show (dlg->priv->charset_combo);
+
+	gtk_table_attach_defaults (GTK_TABLE (dlg->priv->table), dlg->priv->charset_combo, 1, 2, 2, 3);
+
+	enc = (gchar **) encodings;
+	do {
+		gtk_combo_box_append_text (GTK_COMBO_BOX (dlg->priv->charset_combo), _(*enc));
+		enc++;
+	} while (*enc);
+
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
 			    dlg->priv->main_box, FALSE, FALSE, 0);
 	gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);
@@ -431,12 +472,13 @@ void gtranslator_show_profile_dialog (GtranslatorPreferencesDialog *dialog,
 	}
 
         if (gtranslator_profile_get_charset (profile) != NULL) {
-	  gtk_entry_set_text (GTK_ENTRY (GTR_PROFILE_DIALOG (dlg)->priv->charset_entry),
-			      gtranslator_profile_get_charset (profile));
+	  gtk_combo_box_set_active (GTK_COMBO_BOX (GTR_PROFILE_DIALOG (dlg)->priv->charset_combo),
+			      gtranslator_profile_get_charset_index (profile));
+	  gtranslator_profile_set_charset_index (old_profile, gtranslator_profile_get_charset_index (profile));
 	  gtranslator_profile_set_charset (old_profile, gtranslator_profile_get_charset (profile));
 	}
 
-        if (gtranslator_profile_get_encoding (profile) != NULL) {
+	if (gtranslator_profile_get_encoding (profile) != NULL) {
 	  gtk_entry_set_text (GTK_ENTRY (GTR_PROFILE_DIALOG (dlg)->priv->encoding_entry),
 			      gtranslator_profile_get_encoding (profile));
 	  gtranslator_profile_set_encoding (old_profile, gtranslator_profile_get_encoding (profile));
@@ -473,8 +515,8 @@ void gtranslator_show_profile_dialog (GtranslatorPreferencesDialog *dialog,
 	g_signal_connect (GTR_PROFILE_DIALOG (dlg)->priv->language_code_entry, "notify::text",
 			  G_CALLBACK (language_code_entry_changed),
 			  profile);
-	g_signal_connect (GTR_PROFILE_DIALOG (dlg)->priv->charset_entry, "notify::text",
-			  G_CALLBACK (charset_entry_changed),
+	g_signal_connect (GTR_PROFILE_DIALOG (dlg)->priv->charset_combo, "changed",
+			  G_CALLBACK (charset_combo_changed),
 			  profile);
 	g_signal_connect (GTR_PROFILE_DIALOG (dlg)->priv->encoding_entry, "notify::text",
 			  G_CALLBACK (encoding_entry_changed),
diff --git a/src/dialogs/profile-dialog.glade b/src/dialogs/profile-dialog.glade
index e2f7305..fb34d30 100644
--- a/src/dialogs/profile-dialog.glade
+++ b/src/dialogs/profile-dialog.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Wed Aug  6 11:28:41 2008 -->
+<!--Generated with glade3 3.4.5 on Mon Sep  1 19:08:08 2008 -->
 <glade-interface>
   <widget class="GtkDialog" id="dialog1">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -60,27 +60,27 @@
                         <property name="column_spacing">6</property>
                         <property name="row_spacing">6</property>
                         <child>
-                          <widget class="GtkEntry" id="profile_entry">
+                          <widget class="GtkLabel" id="label3">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Name:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">profile_entry</property>
                           </widget>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label3">
+                          <widget class="GtkEntry" id="profile_entry">
                             <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Name:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">profile_entry</property>
                           </widget>
                           <packing>
-                            <property name="x_options">GTK_FILL</property>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
                           </packing>
                         </child>
                       </widget>
@@ -141,7 +141,7 @@
                         <property name="column_spacing">6</property>
                         <property name="row_spacing">6</property>
                         <child>
-                          <widget class="GtkEntry" id="email_entry">
+                          <widget class="GtkEntry" id="name_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -149,40 +149,38 @@
                           <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>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label7">
+                          <widget class="GtkLabel" id="label6">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Email:</property>
+                            <property name="label" translatable="yes">N_ame:</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">email_entry</property>
+                            <property name="mnemonic_widget">name_entry</property>
                           </widget>
                           <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label6">
+                          <widget class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">N_ame:</property>
+                            <property name="label" translatable="yes">_Email:</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">name_entry</property>
+                            <property name="mnemonic_widget">email_entry</property>
                           </widget>
                           <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="name_entry">
+                          <widget class="GtkEntry" id="email_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -190,6 +188,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>
                           </packing>
                         </child>
                       </widget>
@@ -256,23 +256,12 @@
                             <property name="column_spacing">6</property>
                             <property name="row_spacing">6</property>
                             <child>
-                              <widget class="GtkEntry" id="team_email_entry">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
-                              </packing>
+                              <placeholder/>
                             </child>
                             <child>
                               <widget class="GtkEntry" id="encoding_entry">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                               </widget>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -282,53 +271,42 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="charset_entry">
+                              <widget class="GtkLabel" id="label11">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">_Language:</property>
+                                <property name="use_underline">True</property>
                               </widget>
                               <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="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="langcode_entry">
+                              <widget class="GtkLabel" id="label12">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Language _code:</property>
+                                <property name="use_underline">True</property>
                               </widget>
                               <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="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="language_entry">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label15">
+                              <widget class="GtkLabel" id="label13">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Team email:</property>
+                                <property name="label" translatable="yes">Character _set</property>
                                 <property name="use_underline">True</property>
                               </widget>
                               <packing>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
@@ -347,43 +325,54 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label13">
+                              <widget class="GtkLabel" id="label15">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Character _set</property>
+                                <property name="label" translatable="yes">_Team email:</property>
                                 <property name="use_underline">True</property>
                               </widget>
                               <packing>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
                                 <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label12">
+                              <widget class="GtkEntry" id="language_entry">
                                 <property name="visible">True</property>
+                                <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Language _code:</property>
-                                <property name="use_underline">True</property>
                               </widget>
                               <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkEntry" id="langcode_entry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                              </widget>
+                              <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="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label11">
+                              <widget class="GtkEntry" id="team_email_entry">
                                 <property name="visible">True</property>
+                                <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Language:</property>
-                                <property name="use_underline">True</property>
                               </widget>
                               <packing>
-                                <property name="x_options">GTK_FILL</property>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
                               </packing>
                             </child>
                           </widget>
diff --git a/src/profile.c b/src/profile.c
index 8b6efca..d24ae08 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -59,6 +59,11 @@ struct _GtranslatorProfilePrivate
 	 */
 	gchar *charset;
 
+        /*
+         * Index of charset in ComboBox
+         */
+        gint charset_index;
+
 	/*
 	 * Encoding. Example: 8 bits
 	 */
@@ -191,6 +196,16 @@ void gtranslator_profile_set_charset (GtranslatorProfile *profile, gchar *data)
 	profile->priv->charset = g_strdup (data);
 }
 
+gint gtranslator_profile_get_charset_index (GtranslatorProfile *profile)
+{
+	return profile->priv->charset_index;
+}
+
+void gtranslator_profile_set_charset_index (GtranslatorProfile *profile, gint data)
+{
+	profile->priv->charset_index = data;
+}
+
 gchar *gtranslator_profile_get_encoding (GtranslatorProfile *profile)
 {
 	return profile->priv->encoding;
@@ -248,6 +263,7 @@ void gtranslator_profile_xml_new_entry (xmlDocPtr doc, GtranslatorProfile *profi
 	xmlNewChild (profile_node, NULL, "language_name", profile->priv->language_name);
 	xmlNewChild (profile_node, NULL, "language_code", profile->priv->language_code);
 	xmlNewChild (profile_node, NULL, "charset", profile->priv->charset);
+	xmlNewChild (profile_node, NULL, "charset_index", profile->priv->charset_index);
 	xmlNewChild (profile_node, NULL, "encoding", profile->priv->encoding);
 	xmlNewChild (profile_node, NULL, "group_email", profile->priv->group_email);
 	xmlNewChild (profile_node, NULL, "plurals", profile->priv->plurals);
@@ -283,6 +299,8 @@ GtranslatorProfile *gtranslator_profile_xml_get_entry (xmlNodePtr child)
   node = node->next;
   profile->priv->charset = xmlNodeGetContent (node);
   node = node->next;
+  profile->priv->charset_index = atoi (xmlNodeGetContent (node));
+  node = node->next;
   profile->priv->encoding = xmlNodeGetContent (node);
   node = node->next;
   profile->priv->group_email = xmlNodeGetContent (node);
diff --git a/src/profile.h b/src/profile.h
index 3cad043..e991545 100644
--- a/src/profile.h
+++ b/src/profile.h
@@ -87,6 +87,9 @@ void 		 gtranslator_profile_set_language_code 	(GtranslatorProfile *profile, gch
 gchar 		*gtranslator_profile_get_charset 	(GtranslatorProfile *profile);
 void 		 gtranslator_profile_set_charset 	(GtranslatorProfile *profile, gchar *data);
 
+gint             gtranslator_profile_get_charset_index  (GtranslatorProfile *profile);
+void             gtranslator_profile_set_charset_index  (GtranslatorProfile *profile, gint data);
+
 gchar 		*gtranslator_profile_get_encoding 	(GtranslatorProfile *profile);
 void 		 gtranslator_profile_set_encoding 	(GtranslatorProfile *profile, gchar *data);
 
