diff --git a/configure.ac b/configure.ac
index aea1f7f..995cea0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,7 @@ if test x"$UNINSTALLED" = x"yes"; then
 		--vapidir $(UNINSTALLED_DIR)/build/vapi '
 
 	AC_SUBST(account_libdir, $libdir/hedera/module)
-	AC_SUBST(account_datadir,$datadir/hedera/module)
+	AC_SUBST(account_datadir, $datadir/hedera/module)
 	AC_SUBST(querydir,$account_datadir/sql)
 else
 	PKG_CHECK_MODULES(ACCOUNT, [hedera])
diff --git a/data/Makefile.am b/data/Makefile.am
index e74a7a8..8683a25 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,6 +3,6 @@ account_data_DATA = \
 	account.xml \
 	account.ui \
 	users.glade \
-	mail-alias.glade
+	email.glade
 
 EXTRA_DIST = $(management_data_DATA)
diff --git a/data/account.ui b/data/account.ui
index d26d8e8..6eb9fa5 100644
--- a/data/account.ui
+++ b/data/account.ui
@@ -3,7 +3,7 @@
 		<placeholder name="ModuleMenu">
 			<menu name="AccountMenu" action="action-menu-account">
 				<menuitem name="Users" action="open-users"/>
-				<menuitem name="MailAlias" action="open-mail-alias"/>
+				<menuitem name="EMail" action="open-email"/>
 			</menu>
 		</placeholder>
 	</menubar>
diff --git a/data/account.xml b/data/account.xml
index 5e43ba7..dbd0845 100644
--- a/data/account.xml
+++ b/data/account.xml
@@ -12,9 +12,9 @@
 			accel="F2">Users</form>
 		<form
 			translatable="yes"
-			name="mail-alias"
+			name="email"
 			icon="mail-mark-unread"
-			action-name="open-mail-alias"
-			accel="F3">Mail Alias</form>
+			action-name="open-email"
+			accel="F3">E-Mail</form>
 	</form-group>
 </module>
diff --git a/data/mail-alias.glade b/data/email.glade
similarity index 99%
rename from data/mail-alias.glade
rename to data/email.glade
index fc59fa5..d775ccf 100644
--- a/data/mail-alias.glade
+++ b/data/email.glade
@@ -4,13 +4,13 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="VnBatch" id="iterators">
     <child>
-      <object class="VnIterator" id="alias">
-        <property name="model">model-alias</property>
+      <object class="VnIterator" id="child">
+        <property name="model">model-child</property>
       </object>
     </child>
     <child>
-      <object class="VnIterator" id="child">
-        <property name="model">model-child</property>
+      <object class="VnIterator" id="alias">
+        <property name="model">model-alias</property>
       </object>
     </child>
   </object>
@@ -54,6 +54,7 @@
                           <object class="VnColumnEntry" id="column-alias">
                             <property name="title" translatable="yes">Alias</property>
                             <property name="column_name">alias</property>
+                            <property name="editable">True</property>
                           </object>
                         </child>
                       </object>
@@ -157,15 +158,15 @@
     </child>
   </object>
   <object class="VnBatch" id="models">
-    <child>
-      <object class="DbModel" id="model-alias">
-        <property name="sql">SELECT id, alias FROM mail_alias</property>
-      </object>
-    </child>
     <child>
       <object class="DbModel" id="model-child">
         <property name="sql">SELECT parent, child FROM mail_alias_child WHERE #p</property>
       </object>
     </child>
+    <child>
+      <object class="DbModel" id="model-alias">
+        <property name="sql">SELECT id, alias FROM mail_alias</property>
+      </object>
+    </child>
   </object>
 </interface>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7abbfcd..8cabe3a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,5 +6,5 @@ src/account.vala
 src/users.vala
 data/users.glade
 
-src/mail-alias.vala
-data/mail-alias.glade
+src/email.vala
+data/email.glade
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e68b995..83d41bb 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -2,4 +2,4 @@
 
 src/account.c
 src/users.c
-src/mail-alias.c
+src/email.c
diff --git a/po/es.po b/po/es.po
index 769048e..d960405 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-18 10:54+0100\n"
+"POT-Creation-Date: 2013-12-20 16:14+0100\n"
 "PO-Revision-Date: 2013-09-24 12:09+0200\n"
 "Last-Translator: Alejandro T. Colombini <atcolombini@verdnatura.es>\n"
 "Language-Team: none\n"
@@ -31,12 +31,8 @@ msgid "Users"
 msgstr "Usuarios"
 
 #: ../data/account.xml.h:4
-msgid "Mail Alias"
-msgstr "Alias de correo"
-
-#: ../data/account.xml.h:5
-msgid "Queries"
-msgstr "Consultas"
+msgid "E-Mail"
+msgstr "E-Mail"
 
 #: ../src/users.vala:87
 msgid "The password can't be empty."
@@ -106,7 +102,7 @@ msgstr "Expira:"
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../data/users.glade.h:15 ../data/mail-alias.glade.h:1
+#: ../data/users.glade.h:15 ../data/email.glade.h:1
 msgid "Alias"
 msgstr "Alias"
 
@@ -123,21 +119,17 @@ msgid "Secret:"
 msgstr "Clave:"
 
 #: ../data/users.glade.h:19
-msgid "Call group:"
-msgstr "Call group:"
-
-#: ../data/users.glade.h:20
 msgid "SIP"
 msgstr "SIP"
 
-#: ../data/users.glade.h:21
+#: ../data/users.glade.h:20
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: ../data/users.glade.h:22
+#: ../data/users.glade.h:21
 msgid "Repeat password:"
 msgstr "Repetir contraseña:"
 
-#: ../data/mail-alias.glade.h:2
+#: ../data/email.glade.h:2
 msgid "Children"
 msgstr "Hijos"
diff --git a/src/Makefile.am b/src/Makefile.am
index 24f5c4d..ee1da0d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,12 +7,12 @@ libaccount_la_SOURCES = \
 	config.vapi \
 	account.vala \
 	users.vala \
-	mail-alias.vala
+	email.vala
 
 libaccount_la_LIBADD = $(ACCOUNT_LIBS)
 libaccount_la_LDFLAGS = \
 	-avoid-version \
-	-Wl,--export-dynamic
+	-export-dynamic
 
 libaccount_la_CPPFLAGS = \
 	-DPACKAGE_DATA_DIR=\"$(ACCOUNT_datadir)\" \
diff --git a/src/mail-alias.vala b/src/email.vala
similarity index 96%
rename from src/mail-alias.vala
rename to src/email.vala
index c51791c..24f8664 100644
--- a/src/mail-alias.vala
+++ b/src/email.vala
@@ -17,7 +17,7 @@
 
 using Gtk;
 
-public class Vn.MailAlias : Vn.Form
+public class Vn.EMail : Vn.Form
 {
 	public override void open (Gtk.Builder builder)
 	{
@@ -26,4 +26,4 @@ public class Vn.MailAlias : Vn.Form
 
 		child.link ("parent", alias, "id");
 	}
-}
\ No newline at end of file
+}