diff --git a/TMessagesProj/src/main/res/layout-es/application_layout.xml b/TMessagesProj/src/main/res/layout-es/application_layout.xml
new file mode 100644
index 000000000..b3a57e07d
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/application_layout.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="top"
+    android:background="#ffffff">
+
+    <FrameLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="top"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_action_change_photo_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_action_change_photo_layout.xml
new file mode 100644
index 000000000..500e7b768
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_action_change_photo_layout.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingBottom="5dp"
+    android:gravity="center"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.MessageActionLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:id="@+id/message_action_layout">
+
+        <org.telegram.ui.Views.TightTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="15dp"
+            android:id="@+id/chat_message_text"
+            android:textColor="#ffffff"
+            android:paddingTop="1dp"
+            android:paddingBottom="1dp"
+            android:ellipsize="none"
+            android:gravity="center"
+            android:maxLines="10"
+            android:maxWidth="380dp"
+            android:layout_gravity="center"/>
+
+    </org.telegram.ui.Views.MessageActionLayout>
+
+    <org.telegram.ui.Views.BackupImageView
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:layout_marginTop="5dp"
+        android:scaleType="fitCenter"
+        android:id="@+id/chat_photo_image"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_action_message_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_action_message_layout.xml
new file mode 100644
index 000000000..1229042cf
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_action_message_layout.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="5dp"
+    android:gravity="center"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.MessageActionLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:id="@+id/message_action_layout">
+
+        <org.telegram.ui.Views.TightTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="14dp"
+            android:id="@+id/chat_message_text"
+            android:textColor="#ffffff"
+            android:paddingTop="1dp"
+            android:paddingBottom="1dp"
+            android:ellipsize="none"
+            android:gravity="center"
+            android:maxLines="10"
+            android:layout_gravity="center"/>
+
+    </org.telegram.ui.Views.MessageActionLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_group_incoming_contact_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_group_incoming_contact_layout.xml
new file mode 100644
index 000000000..f86882572
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_group_incoming_contact_layout.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.BackupImageView
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_marginLeft="6dp"
+        android:id="@+id/chat_group_avatar_image"
+        android:scaleType="fitCenter"
+        android:layout_marginBottom="2dp"
+        android:layout_marginRight="4dp"
+        android:layout_gravity="bottom"/>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_height="69dp"
+        android:layout_width="wrap_content"
+        android:layout_marginRight="40dp"
+        android:layout_gravity="top"
+        android:baselineAligned="false"
+        android:id="@+id/chat_bubble_layout">
+
+        <FrameLayout
+            android:layout_height="58dp"
+            android:layout_width="0dp"
+            android:id="@+id/shared_layout"
+            android:layout_weight="1">
+
+            <org.telegram.ui.Views.BackupImageView android:layout_height="42dp"
+                android:layout_width="42dp"
+                android:id="@+id/contact_avatar"/>
+
+            <TextView android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:scrollHorizontally="true"
+                android:paddingLeft="51dp"
+                android:layout_marginTop="1dp"
+                android:textSize="15dp"
+                android:lines="1"
+                android:layout_gravity="top|left"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:id="@+id/chat_user_group_name"/>
+
+            <TextView android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:paddingLeft="51dp"
+                android:layout_marginTop="20dp"
+                android:textSize="15dp"
+                android:layout_gravity="top|left"
+                android:maxLines="1"
+                android:id="@+id/phone_text_view"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/chat_time_text"
+                android:textColor="#a1aab3"
+                android:textSize="12dp"
+                android:layout_gravity="bottom|right"/>
+
+        </FrameLayout>
+
+
+        <FrameLayout android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_gravity="top"
+            android:id="@+id/add_contact_view">
+
+            <FrameLayout android:layout_height="54dp"
+                android:layout_width="1dp"
+                android:background="#e8e8e8"
+                android:paddingRight="8dp"/>
+
+            <ImageView android:layout_width="38dp"
+                android:layout_height="54dp"
+                android:src="@drawable/ic_ab_add_member"
+                android:scaleType="center"
+                android:layout_marginLeft="8dp"
+                android:paddingRight="4dp"
+                android:id="@+id/add_contact_button"/>
+
+        </FrameLayout>
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_group_incoming_document_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_group_incoming_document_layout.xml
new file mode 100644
index 000000000..92c29c4db
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_group_incoming_document_layout.xml
@@ -0,0 +1,138 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top"
+    android:gravity="left">
+
+    <org.telegram.ui.Views.BackupImageView
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_marginLeft="6dp"
+        android:id="@+id/chat_group_avatar_image"
+        android:scaleType="fitCenter"
+        android:layout_marginBottom="2dp"
+        android:layout_marginRight="4dp"
+        android:layout_gravity="bottom"/>
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:orientation="horizontal"
+        android:layout_height="78dp"
+        android:layout_width="wrap_content"
+        android:paddingTop="9dp"
+        android:paddingLeft="18dp"
+        android:paddingRight="9dp"
+        android:layout_gravity="top|left"
+        android:id="@+id/chat_bubble_layout">
+
+        <org.telegram.ui.Views.FrameLayoutFixed
+            android:layout_height="69dp"
+            android:layout_width="wrap_content"
+            android:layout_gravity="top|right"
+            android:id="@+id/shared_layout">
+
+            <org.telegram.ui.Views.BackupImageView
+                android:layout_width="42dp"
+                android:layout_height="42dp"
+                android:background="#40b7c9d7"
+                android:src="@drawable/doc_blue"
+                android:scaleType="center"
+                android:id="@+id/contact_avatar"/>
+
+            <org.telegram.ui.Views.TightTextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="3dp"
+                android:textSize="14dp"
+                android:lines="1"
+                android:singleLine="true"
+                android:layout_gravity="top"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textColor="#000000"
+                android:layout_marginRight="2dp"
+                android:id="@+id/chat_user_group_name"
+                android:layout_marginLeft="50dp"/>
+
+            <org.telegram.ui.Views.TightTextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginLeft="50dp"
+                android:singleLine="true"
+                android:layout_marginTop="22dp"
+                android:layout_gravity="top"
+                android:layout_marginRight="2dp"
+                android:textSize="11dp"
+                android:maxLines="1"
+                android:textColor="#9daab8"
+                android:id="@+id/phone_text_view"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/chat_time_text"
+                android:textColor="#a1aab3"
+                android:textSize="12dp"
+                android:layout_marginBottom="5dp"
+                android:layout_gravity="bottom|right"/>
+
+        </org.telegram.ui.Views.FrameLayoutFixed>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_height="wrap_content"
+        android:layout_width="140dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_gravity="center_vertical"
+        android:id="@+id/chat_view_action_layout"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:scaleType="centerInside"
+            android:layout_marginRight="4dp"
+            android:layout_gravity="right|center"
+            android:id="@+id/chat_view_action_cancel_button"
+            android:src="@drawable/ic_msg_btn_cross_custom"
+            android:clickable="true"/>
+
+        <ProgressBar
+            android:layout_width="fill_parent"
+            android:layout_height="3dp"
+            android:layout_gravity="left|center_vertical"
+            android:progressDrawable="@drawable/photo_progress_chat"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:progress="50"
+            android:layout_marginLeft="12dp"
+            android:layout_marginRight="36dp"
+            android:id="@+id/chat_view_action_progress"
+            android:max="100"/>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/DOWNLOAD"
+        android:textColor="#54759e"
+        android:background="@drawable/chat_incoming_media_states"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:id="@+id/chat_view_action_button"
+        android:textSize="14dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:descendantFocusability="blocksDescendants"
+        android:clickable="true"
+        android:gravity="center|left"
+        android:visibility="gone"
+        android:textStyle="bold"
+        android:layout_gravity="center_vertical|left"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_group_incoming_forward_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_group_incoming_forward_layout.xml
new file mode 100644
index 000000000..cea511a64
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_group_incoming_forward_layout.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.BackupImageView
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_marginLeft="6dp"
+        android:id="@+id/chat_group_avatar_image"
+        android:scaleType="fitCenter"
+        android:layout_marginBottom="2dp"
+        android:layout_gravity="bottom"/>
+
+    <org.telegram.ui.Views.MessageLayout
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginRight="40dp"
+        android:id="@+id/message_layout"
+        android:layout_marginLeft="4dp"
+        android:layout_gravity="top">
+
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:id="@+id/chat_user_group_name"
+            android:textColor="#4982b1"
+            android:textSize="15dp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:lineSpacingExtra="2dp"
+            android:layout_gravity="top"/>
+
+        <TextView android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:textColor="#006fc8"
+            android:textSize="14dp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:layout_marginTop="19dp"
+            android:text="@string/ForwardedMessage"
+            android:layout_gravity="top|left"
+            android:id="@+id/chat_text_forward_text"/>
+
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:id="@+id/chat_text_forward_name"
+            android:textColor="#006fc8"
+            android:textSize="14dp"
+            android:layout_marginTop="35dp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:layout_gravity="top|left"/>
+
+        <org.telegram.ui.Views.TightTextView
+            android:id="@+id/chat_message_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16dp"
+            android:linksClickable="false"
+            android:layout_marginBottom="8dp"
+            android:autoLink="web|email"
+            android:descendantFocusability="afterDescendants"
+            android:layout_marginTop="53dp"
+            android:layout_gravity="top"
+            android:textColor="#000000"
+            android:textColorLink="#316f9f"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/chat_time_text"
+            android:textColor="#a1aab3"
+            android:textSize="12dp"
+            android:paddingBottom="5dp"
+            android:layout_gravity="bottom|right"/>
+
+    </org.telegram.ui.Views.MessageLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_group_incoming_location_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_group_incoming_location_layout.xml
new file mode 100644
index 000000000..1b1988942
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_group_incoming_location_layout.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.BackupImageView
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_marginLeft="6dp"
+        android:id="@+id/chat_group_avatar_image"
+        android:scaleType="fitCenter"
+        android:layout_marginBottom="2dp"
+        android:layout_gravity="bottom"/>
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="13dp"
+        android:layout_gravity="top"
+        android:id="@+id/chat_bubble_layout"
+        android:addStatesFromChildren="true">
+
+        <org.telegram.ui.Views.BackupImageView
+            android:layout_height="100dp"
+            android:layout_width="100dp"
+            android:layout_margin="6dp"
+            android:layout_gravity="top"
+            android:scaleType="centerCrop"
+            android:id="@+id/chat_photo_image"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:id="@+id/chat_time_layout"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
+            android:paddingBottom="1dp"
+            android:paddingTop="1dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_gravity="right|bottom"
+            android:background="@drawable/phototime">
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:textColor="#ffffff"
+                android:textSize="12dp"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="1dp"
+                android:id="@+id/chat_time_text"/>
+
+        </LinearLayout>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/ViewLocation"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:textStyle="bold"
+        android:id="@+id/chat_view_action_button"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:textSize="14dp"
+        android:textColor="#54759e"
+        android:background="@drawable/chat_incoming_media_states"
+        android:descendantFocusability="blocksDescendants"
+        android:clickable="true"
+        android:layout_marginLeft="10dp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_group_incoming_photo_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_group_incoming_photo_layout.xml
new file mode 100644
index 000000000..20a8122e1
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_group_incoming_photo_layout.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.BackupImageView
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_marginLeft="6dp"
+        android:id="@+id/chat_group_avatar_image"
+        android:scaleType="fitCenter"
+        android:layout_marginBottom="2dp"
+        android:layout_gravity="bottom"/>
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="13dp"
+        android:layout_gravity="top"
+        android:id="@+id/chat_bubble_layout"
+        android:addStatesFromChildren="true">
+
+        <org.telegram.ui.Views.BackupImageView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_margin="6dp"
+            android:layout_gravity="top"
+            android:scaleType="centerCrop"
+            android:minHeight="100dp"
+            android:minWidth="100dp"
+            android:id="@+id/chat_photo_image"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:id="@+id/chat_time_layout"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
+            android:paddingBottom="1dp"
+            android:paddingTop="1dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_gravity="right|bottom"
+            android:background="@drawable/phototime">
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:textColor="#ffffff"
+                android:textSize="12dp"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="1dp"
+                android:id="@+id/chat_time_text"/>
+
+        </LinearLayout>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/ViewPhoto"
+        android:textColor="#54759e"
+        android:background="@drawable/chat_incoming_media_states"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:textStyle="bold"
+        android:id="@+id/chat_view_action_button"
+        android:textSize="14dp"
+        android:layout_gravity="center"
+        android:descendantFocusability="blocksDescendants"
+        android:clickable="true"
+        android:gravity="center"
+        android:layout_marginLeft="10dp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_group_incoming_text_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_group_incoming_text_layout.xml
new file mode 100644
index 000000000..08e39cd57
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_group_incoming_text_layout.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top|left">
+
+    <org.telegram.ui.Views.BackupImageView
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_marginLeft="6dp"
+        android:id="@+id/chat_group_avatar_image"
+        android:scaleType="fitCenter"
+        android:layout_marginBottom="2dp"
+        android:layout_gravity="bottom"/>
+
+    <org.telegram.ui.Views.MessageLayout
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginRight="40dp"
+        android:id="@+id/message_layout"
+        android:layout_marginLeft="4dp"
+        android:layout_gravity="top|left">
+
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:id="@+id/chat_user_group_name"
+            android:textColor="#4982b1"
+            android:textSize="15dp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:lineSpacingExtra="2dp"
+            android:layout_gravity="top|left"/>
+
+        <org.telegram.ui.Views.TightTextView
+            android:id="@+id/chat_message_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16dp"
+            android:layout_marginBottom="8dp"
+            android:autoLink="web|email"
+            android:linksClickable="false"
+            android:layout_marginTop="18dp"
+            android:textColor="#000000"
+            android:layout_gravity="top|left"
+            android:textColorLink="#316f9f"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/chat_time_text"
+            android:textColor="#a1aab3"
+            android:textSize="12dp"
+            android:paddingBottom="5dp"
+            android:layout_gravity="bottom|right"/>
+
+    </org.telegram.ui.Views.MessageLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_group_incoming_video_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_group_incoming_video_layout.xml
new file mode 100644
index 000000000..ac594232d
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_group_incoming_video_layout.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.BackupImageView
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_marginLeft="6dp"
+        android:id="@+id/chat_group_avatar_image"
+        android:scaleType="fitCenter"
+        android:layout_marginBottom="2dp"
+        android:layout_gravity="bottom"/>
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="13dp"
+        android:layout_gravity="top"
+        android:id="@+id/chat_bubble_layout"
+        android:addStatesFromChildren="true">
+
+        <org.telegram.ui.Views.BackupImageView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_margin="6dp"
+            android:layout_gravity="top"
+            android:scaleType="centerCrop"
+            android:minHeight="100dp"
+            android:minWidth="100dp"
+            android:id="@+id/chat_photo_image"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_gravity="top"
+            android:background="@drawable/phototime"
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:src="@drawable/ic_video"/>
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:textColor="#ffffff"
+                android:textSize="12dp"
+                android:layout_marginLeft="4dp"
+                android:gravity="center_vertical"
+                android:layout_gravity="center_vertical"
+                android:layout_marginBottom="1dp"
+                android:id="@+id/chat_video_time"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:id="@+id/chat_time_layout"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
+            android:paddingBottom="1dp"
+            android:paddingTop="1dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_gravity="right|bottom"
+            android:background="@drawable/phototime">
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:textColor="#ffffff"
+                android:textSize="12dp"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="1dp"
+                android:id="@+id/chat_time_text"/>
+
+        </LinearLayout>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/ViewVideo"
+        android:textColor="#54759e"
+        android:background="@drawable/chat_incoming_media_states"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:id="@+id/chat_view_action_button"
+        android:textSize="14dp"
+        android:layout_gravity="center"
+        android:descendantFocusability="blocksDescendants"
+        android:clickable="true"
+        android:gravity="center"
+        android:textStyle="bold"
+        android:layout_marginLeft="10dp"
+        android:visibility="gone"/>
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_height="wrap_content"
+        android:layout_width="140dp"
+        android:layout_marginLeft="10dp"
+        android:layout_gravity="center_vertical"
+        android:id="@+id/chat_view_action_layout"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:scaleType="centerInside"
+            android:layout_marginRight="4dp"
+            android:layout_gravity="right|center"
+            android:id="@+id/chat_view_action_cancel_button"
+            android:src="@drawable/ic_msg_btn_cross_custom"
+            android:clickable="true"/>
+
+        <ProgressBar
+            android:layout_width="fill_parent"
+            android:layout_height="3dp"
+            android:layout_gravity="left|center_vertical"
+            android:progressDrawable="@drawable/photo_progress_chat"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:progress="50"
+            android:layout_marginLeft="12dp"
+            android:layout_marginRight="36dp"
+            android:id="@+id/chat_view_action_progress"
+            android:max="100"/>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_header_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_header_layout.xml
new file mode 100644
index 000000000..8fb0b2f79
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_header_layout.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true">
+
+    <org.telegram.ui.Views.BackupImageView
+            android:layout_height="48dp"
+            android:layout_width="48dp"
+            android:id="@+id/chat_avatar_image"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_incoming_contact_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_incoming_contact_layout.xml
new file mode 100644
index 000000000..946a2649c
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_incoming_contact_layout.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_height="69dp"
+        android:layout_width="wrap_content"
+        android:layout_marginRight="40dp"
+        android:layout_gravity="top"
+        android:id="@+id/chat_bubble_layout">
+
+        <FrameLayout android:layout_height="58dp"
+            android:layout_width="0dp"
+            android:id="@+id/shared_layout"
+            android:layout_weight="1">
+
+            <org.telegram.ui.Views.BackupImageView android:layout_height="42dp"
+                android:layout_width="42dp"
+                android:id="@+id/contact_avatar"/>
+
+            <TextView android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:scrollHorizontally="true"
+                android:paddingLeft="51dp"
+                android:layout_marginTop="1dp"
+                android:textSize="15dp"
+                android:lines="1"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:layout_gravity="top"
+                android:id="@+id/chat_user_group_name"/>
+
+            <TextView android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:paddingLeft="51dp"
+                android:layout_marginTop="20dp"
+                android:textSize="15dp"
+                android:maxLines="1"
+                android:layout_gravity="top"
+                android:id="@+id/phone_text_view"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/chat_time_text"
+                android:textColor="#a1aab3"
+                android:textSize="12dp"
+                android:layout_gravity="bottom|right"/>
+
+        </FrameLayout>
+
+
+        <FrameLayout android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_gravity="top"
+            android:id="@+id/add_contact_view">
+
+            <FrameLayout android:layout_height="54dp"
+                android:layout_width="1dp"
+                android:background="#e8e8e8"
+                android:paddingRight="8dp"/>
+
+            <ImageView android:layout_width="38dp"
+                android:layout_height="54dp"
+                android:src="@drawable/ic_ab_add_member"
+                android:scaleType="center"
+                android:layout_marginLeft="8dp"
+                android:paddingRight="4dp"
+                android:id="@+id/add_contact_button"/>
+
+        </FrameLayout>
+
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_incoming_document_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_incoming_document_layout.xml
new file mode 100644
index 000000000..5fa9cefa6
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_incoming_document_layout.xml
@@ -0,0 +1,128 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top"
+    android:gravity="left">
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:orientation="horizontal"
+        android:layout_height="78dp"
+        android:layout_width="wrap_content"
+        android:paddingTop="9dp"
+        android:paddingLeft="18dp"
+        android:paddingRight="9dp"
+        android:layout_gravity="top|left"
+        android:id="@+id/chat_bubble_layout">
+
+        <org.telegram.ui.Views.FrameLayoutFixed
+            android:layout_height="69dp"
+            android:layout_width="wrap_content"
+            android:layout_gravity="top|right"
+            android:id="@+id/shared_layout">
+
+            <org.telegram.ui.Views.BackupImageView
+                android:layout_width="42dp"
+                android:layout_height="42dp"
+                android:background="#40b7c9d7"
+                android:src="@drawable/doc_blue"
+                android:scaleType="center"
+                android:id="@+id/contact_avatar"/>
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:scrollHorizontally="true"
+                android:layout_marginTop="3dp"
+                android:textSize="14dp"
+                android:lines="1"
+                android:singleLine="true"
+                android:layout_marginRight="2dp"
+                android:layout_gravity="top"
+                android:ellipsize="end"
+                android:textColor="#000000"
+                android:id="@+id/chat_user_group_name"
+                android:maxLines="1"
+                android:layout_marginLeft="50dp"/>
+
+            <TextView android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginLeft="50dp"
+                android:layout_marginTop="22dp"
+                android:layout_gravity="top"
+                android:layout_marginRight="2dp"
+                android:textSize="11dp"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textColor="#9daab8"
+                android:id="@+id/phone_text_view"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/chat_time_text"
+                android:textColor="#a1aab3"
+                android:textSize="12dp"
+                android:layout_gravity="bottom|right"
+                android:layout_marginBottom="5dp"/>
+
+        </org.telegram.ui.Views.FrameLayoutFixed>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_height="wrap_content"
+        android:layout_width="140dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_gravity="center_vertical"
+        android:id="@+id/chat_view_action_layout"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:scaleType="centerInside"
+            android:layout_marginRight="4dp"
+            android:layout_gravity="right|center"
+            android:id="@+id/chat_view_action_cancel_button"
+            android:src="@drawable/ic_msg_btn_cross_custom"
+            android:clickable="true"/>
+
+        <ProgressBar
+            android:layout_width="fill_parent"
+            android:layout_height="3dp"
+            android:layout_gravity="left|center_vertical"
+            android:progressDrawable="@drawable/photo_progress_chat"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:progress="50"
+            android:layout_marginLeft="12dp"
+            android:layout_marginRight="36dp"
+            android:id="@+id/chat_view_action_progress"
+            android:max="100"/>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/DOWNLOAD"
+        android:textColor="#54759e"
+        android:background="@drawable/chat_incoming_media_states"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:id="@+id/chat_view_action_button"
+        android:textSize="14dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:descendantFocusability="blocksDescendants"
+        android:clickable="true"
+        android:gravity="center"
+        android:visibility="gone"
+        android:textStyle="bold"
+        android:layout_gravity="center_vertical"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_incoming_forward_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_incoming_forward_layout.xml
new file mode 100644
index 000000000..7ef566b04
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_incoming_forward_layout.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top|left">
+
+    <org.telegram.ui.Views.MessageLayout
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="40dp"
+            android:id="@+id/message_layout"
+            android:layout_gravity="top|left">
+
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:textColor="#006fc8"
+            android:textSize="14dp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:text="@string/ForwardedMessage"
+            android:layout_gravity="top|left"
+            android:id="@+id/chat_text_forward_text"/>
+
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:id="@+id/chat_text_forward_name"
+            android:textColor="#006fc8"
+            android:textSize="14dp"
+            android:layout_marginTop="16dp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:layout_gravity="top|left"/>
+
+        <org.telegram.ui.Views.TightTextView
+            android:id="@+id/chat_message_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16dp"
+            android:layout_marginBottom="8dp"
+            android:autoLink="web|email"
+            android:linksClickable="false"
+            android:layout_marginTop="34dp"
+            android:descendantFocusability="afterDescendants"
+            android:layout_gravity="top|left"
+            android:textColor="#000000"
+            android:textColorLink="#316f9f"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/chat_time_text"
+            android:textColor="#a1aab3"
+            android:textSize="12dp"
+            android:paddingBottom="5dp"
+            android:layout_gravity="bottom|right"/>
+
+    </org.telegram.ui.Views.MessageLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_incoming_location_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_incoming_location_layout.xml
new file mode 100644
index 000000000..e571dd78f
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_incoming_location_layout.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="9dp"
+        android:id="@+id/chat_bubble_layout"
+        android:layout_gravity="top"
+        android:addStatesFromChildren="true">
+
+        <org.telegram.ui.Views.BackupImageView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_margin="6dp"
+            android:layout_gravity="top"
+            android:scaleType="centerCrop"
+            android:minHeight="100dp"
+            android:minWidth="100dp"
+            android:id="@+id/chat_photo_image"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:id="@+id/chat_time_layout"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
+            android:paddingBottom="1dp"
+            android:paddingTop="1dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_gravity="right|bottom"
+            android:background="@drawable/phototime">
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:textColor="#ffffff"
+                android:textSize="12dp"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="1dp"
+                android:id="@+id/chat_time_text"/>
+
+        </LinearLayout>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/ViewLocation"
+        android:textColor="#54759e"
+        android:background="@drawable/chat_incoming_media_states"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:textStyle="bold"
+        android:id="@+id/chat_view_action_button"
+        android:textSize="14dp"
+        android:layout_marginLeft="10dp"
+        android:descendantFocusability="blocksDescendants"
+        android:clickable="true"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_incoming_photo_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_incoming_photo_layout.xml
new file mode 100644
index 000000000..d064735c1
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_incoming_photo_layout.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.FrameLayoutFixed android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:layout_marginLeft="9dp"
+                 android:id="@+id/chat_bubble_layout"
+                 android:layout_gravity="top"
+                 android:addStatesFromChildren="true">
+
+        <org.telegram.ui.Views.BackupImageView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_margin="6dp"
+            android:layout_gravity="top"
+            android:scaleType="centerCrop"
+            android:minHeight="100dp"
+            android:minWidth="100dp"
+            android:id="@+id/chat_photo_image"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:id="@+id/chat_time_layout"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
+            android:paddingBottom="1dp"
+            android:paddingTop="1dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_gravity="right|bottom"
+            android:background="@drawable/phototime">
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:textColor="#ffffff"
+                android:textSize="12dp"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="1dp"
+                android:id="@+id/chat_time_text"/>
+
+        </LinearLayout>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/ViewPhoto"
+        android:textColor="#54759e"
+        android:background="@drawable/chat_incoming_media_states"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:textStyle="bold"
+        android:id="@+id/chat_view_action_button"
+        android:textSize="14dp"
+        android:layout_marginLeft="10dp"
+        android:descendantFocusability="blocksDescendants"
+        android:clickable="true"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_incoming_text_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_incoming_text_layout.xml
new file mode 100644
index 000000000..8e38644b9
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_incoming_text_layout.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.MessageLayout
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginRight="40dp"
+        android:id="@+id/message_layout"
+        android:layout_gravity="top">
+
+        <org.telegram.ui.Views.TightTextView
+            android:id="@+id/chat_message_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16dp"
+            android:layout_marginBottom="8dp"
+            android:autoLink="web|email"
+            android:linksClickable="false"
+            android:layout_gravity="top"
+            android:textColor="#000000"
+            android:textColorLink="#316f9f"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/chat_time_text"
+            android:textColor="#a1aab3"
+            android:textSize="12dp"
+            android:paddingBottom="5dp"
+            android:layout_gravity="bottom|right"/>
+
+    </org.telegram.ui.Views.MessageLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_incoming_video_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_incoming_video_layout.xml
new file mode 100644
index 000000000..caf2f8635
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_incoming_video_layout.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="9dp"
+        android:id="@+id/chat_bubble_layout"
+        android:layout_gravity="top"
+        android:addStatesFromChildren="true">
+
+        <org.telegram.ui.Views.BackupImageView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_margin="6dp"
+            android:layout_gravity="top"
+            android:scaleType="centerCrop"
+            android:minHeight="100dp"
+            android:minWidth="100dp"
+            android:id="@+id/chat_photo_image"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_gravity="top"
+            android:background="@drawable/phototime"
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:src="@drawable/ic_video"/>
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:textColor="#ffffff"
+                android:textSize="12dp"
+                android:layout_marginLeft="4dp"
+                android:gravity="center_vertical"
+                android:layout_gravity="center_vertical"
+                android:layout_marginBottom="1dp"
+                android:id="@+id/chat_video_time"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:id="@+id/chat_time_layout"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
+            android:paddingBottom="1dp"
+            android:paddingTop="1dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_gravity="right|bottom"
+            android:background="@drawable/phototime">
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:textColor="#ffffff"
+                android:textSize="12dp"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="1dp"
+                android:id="@+id/chat_time_text"/>
+
+        </LinearLayout>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/ViewVideo"
+        android:textColor="#54759e"
+        android:background="@drawable/chat_incoming_media_states"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:id="@+id/chat_view_action_button"
+        android:textSize="14dp"
+        android:layout_gravity="center"
+        android:descendantFocusability="blocksDescendants"
+        android:clickable="true"
+        android:gravity="center"
+        android:visibility="gone"
+        android:textStyle="bold"
+        android:layout_marginLeft="10dp"/>
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_height="wrap_content"
+        android:layout_width="140dp"
+        android:layout_marginLeft="10dp"
+        android:layout_gravity="center_vertical"
+        android:id="@+id/chat_view_action_layout"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:scaleType="centerInside"
+            android:layout_marginRight="4dp"
+            android:layout_gravity="right|center"
+            android:id="@+id/chat_view_action_cancel_button"
+            android:src="@drawable/ic_msg_btn_cross_custom"
+            android:clickable="true"/>
+
+        <ProgressBar
+            android:layout_width="fill_parent"
+            android:layout_height="3dp"
+            android:layout_gravity="left|center_vertical"
+            android:progressDrawable="@drawable/photo_progress_chat"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:progress="50"
+            android:layout_marginLeft="12dp"
+            android:layout_marginRight="36dp"
+            android:id="@+id/chat_view_action_progress"
+            android:max="100"/>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_layout.xml
new file mode 100644
index 000000000..3098d1a7d
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_layout.xml
@@ -0,0 +1,221 @@
+<org.telegram.ui.Views.SizeNotifierRelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/chat_layout">
+
+    <ImageView
+        android:layout_height="fill_parent"
+        android:layout_width="fill_parent"
+        android:id="@+id/background_image"
+        android:scaleType="centerCrop"/>
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_height="fill_parent"
+        android:layout_width="fill_parent"
+        android:paddingBottom="48dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#ffffff"
+            android:gravity="center"
+            android:text="@string/NoMessages"
+            android:paddingTop="2dp"
+            android:paddingBottom="2dp"
+            android:paddingLeft="7dp"
+            android:paddingRight="7dp"
+            android:textSize="14dp"
+            android:id="@+id/searchEmptyView"
+            android:visibility="gone"
+            android:layout_gravity="center"/>
+
+        <include
+            layout="@layout/encrypted_chat_placeholder"
+            android:layout_gravity="center"/>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+    <org.telegram.ui.Views.LayoutListView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/chat_list_view"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:clipToPadding="false"
+        android:layout_marginBottom="-3dp"
+        android:layout_above="@+id/chat_compose_panel"
+        android:divider="@null"
+        android:dividerHeight="0dp"
+        android:listSelector="@android:color/transparent"
+        android:fadingEdge="none"
+        android:fadingEdgeLength="0dp"
+        android:stackFromBottom="true"
+        android:paddingBottom="3dp"
+        android:paddingTop="4dp"
+        android:cacheColorHint="#00000000"/>
+
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:id="@+id/progressLayout"
+        android:visibility="gone">
+
+        <FrameLayout
+            android:id="@+id/progressLayoutInner"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:gravity="center"
+            android:layout_marginBottom="48dp">
+
+            <ProgressBar
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:id="@+id/center_progress"
+                android:indeterminateDrawable="@drawable/loading_animation"
+                android:indeterminate="true"
+                android:layout_gravity="center"
+                android:indeterminateBehavior="repeat"
+                android:indeterminateDuration="1500">
+            </ProgressBar>
+
+        </FrameLayout>
+
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_width="fill_parent"
+        android:layout_height="48dp"
+        android:id="@+id/top_panel">
+
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center"
+            android:id="@+id/top_panel_text"
+            android:textAllCaps="true"
+            android:textSize="12dp"
+            android:textStyle="bold"
+            android:textColor="#ffffff"/>
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:scaleType="centerInside"
+            android:layout_marginRight="4dp"
+            android:layout_gravity="right|center"
+            android:id="@+id/top_plane_close"
+            android:clickable="true"/>
+
+    </FrameLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/compose_panel"
+        android:id="@+id/chat_compose_panel"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:gravity="bottom"
+        android:layout_alignParentBottom="true">
+
+        <ImageView
+            android:src="@drawable/ic_msg_panel_smiles"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="2dp"
+            android:paddingTop="1dp"
+            android:scaleType="centerInside"
+            android:paddingLeft="4dp"
+            android:id="@+id/chat_smile_button"
+            android:layout_alignBottom="@+id/chat_text_edit"/>
+
+        <ImageButton
+            android:layout_width="52dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="2dp"
+            android:scaleType="centerInside"
+            android:id="@+id/chat_send_button"
+            android:layout_alignParentRight="true"
+            android:layout_alignBottom="@+id/chat_text_edit"
+            android:enabled="false"
+            android:background="@android:color/transparent"/>
+
+        <EditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/chat_text_edit"
+            android:layout_toRightOf="@id/chat_smile_button"
+            android:layout_toLeftOf="@id/chat_send_button"
+            android:layout_marginTop="2dp"
+            android:maxLines="4"
+            android:minHeight="48dp"
+            android:textSize="18dp"
+            android:textColorHint="#909090"
+            android:ems="10"
+            android:imeOptions="flagNoExtractUi"
+            android:hint="@string/TypeMessage"
+            android:inputType="textCapSentences|textMultiLine"
+            android:layout_alignParentTop="true"
+            android:paddingBottom="12dp"
+            android:maxLength="16384"
+            android:textCursorDrawable="@null"
+            android:textColor="#000000"/>
+
+    </RelativeLayout>
+
+    <FrameLayout
+        android:layout_height="48dp"
+        android:layout_width="fill_parent"
+        android:layout_alignParentBottom="true"
+        android:background="#ffffff"
+        android:id="@+id/bottom_overlay"
+        android:visibility="gone"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:clickable="true">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/bottom_overlay_text"
+            android:textColor="#7f7f7f"
+            android:textSize="16dp"
+            android:layout_gravity="center"/>
+
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_height="48dp"
+        android:layout_width="fill_parent"
+        android:layout_alignParentBottom="true"
+        android:background="#fbfcfd"
+        android:id="@+id/bottom_overlay_chat"
+        android:visibility="gone"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:clickable="true">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/bottom_overlay_chat_text"
+            android:textColor="#3e6fa1"
+            android:textSize="18dp"
+            android:text="@string/DeleteThisGroup"
+            android:layout_gravity="center"/>
+
+    </FrameLayout>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/pagedown"
+        android:layout_above="@id/chat_compose_panel"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="4dp"
+        android:layout_marginBottom="4dp"
+        android:id="@+id/pagedown_button"/>
+
+</org.telegram.ui.Views.SizeNotifierRelativeLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_loading_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_loading_layout.xml
new file mode 100644
index 000000000..7d15e8b0d
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_loading_layout.xml
@@ -0,0 +1,27 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp">
+
+    <FrameLayout
+        android:id="@+id/progressLayout"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:gravity="center"
+        android:layout_gravity="center">
+
+        <ProgressBar
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:id="@+id/center_progress"
+            android:indeterminateDrawable="@drawable/loading_animation"
+            android:indeterminate="true"
+            android:layout_gravity="center"
+            android:indeterminateBehavior="repeat"
+            android:indeterminateDuration="1500">
+        </ProgressBar>
+
+    </FrameLayout>
+
+</FrameLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/chat_outgoing_contact_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_outgoing_contact_layout.xml
new file mode 100644
index 000000000..a9d847728
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_outgoing_contact_layout.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_height="69dp"
+        android:layout_width="wrap_content"
+        android:layout_marginLeft="40dp"
+        android:layout_gravity="top|right"
+        android:id="@+id/chat_bubble_layout">
+
+        <FrameLayout android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="8dp"
+            android:layout_gravity="top"
+            android:id="@+id/add_contact_view">
+
+            <FrameLayout android:layout_height="54dp"
+                android:layout_width="1dp"
+                android:background="#aa70b15c"
+                android:paddingLeft="8dp"
+                android:layout_gravity="right"/>
+
+            <ImageView android:layout_width="40dp"
+                android:layout_height="54dp"
+                android:src="@drawable/ic_ab_add_member"
+                android:scaleType="center"
+                android:layout_marginRight="8dp"
+                android:paddingLeft="4dp"
+                android:id="@+id/add_contact_button"/>
+
+        </FrameLayout>
+
+        <FrameLayout android:layout_height="58dp"
+            android:layout_width="0dp"
+            android:id="@+id/shared_layout"
+            android:layout_weight="1">
+
+            <org.telegram.ui.Views.BackupImageView android:layout_height="42dp"
+                android:layout_width="42dp"
+                android:id="@+id/contact_avatar"/>
+
+            <TextView android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:scrollHorizontally="true"
+                android:paddingLeft="51dp"
+                android:layout_marginTop="1dp"
+                android:textSize="15dp"
+                android:lines="1"
+                android:singleLine="true"
+                android:layout_gravity="top"
+                android:ellipsize="end"
+                android:id="@+id/chat_user_group_name"/>
+
+            <TextView android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:paddingLeft="51dp"
+                android:layout_marginTop="20dp"
+                android:layout_gravity="top"
+                android:textSize="15dp"
+                android:maxLines="1"
+                android:id="@+id/phone_text_view"/>
+
+            <LinearLayout android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/chat_time_layout"
+                android:layout_gravity="bottom|right">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/chat_time_text"
+                    android:textColor="#70b15c"
+                    android:textSize="12dp"/>
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/msg_check"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="-8dp"
+                    android:id="@+id/chat_row_check"
+                    android:visibility="visible"
+                    android:layout_gravity="top"/>
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/msg_halfcheck"
+                    android:layout_marginTop="2dp"
+                    android:id="@+id/chat_row_halfcheck"
+                    android:visibility="visible"
+                    android:layout_gravity="top"/>
+
+            </LinearLayout>
+
+        </FrameLayout>
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_outgoing_document_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_outgoing_document_layout.xml
new file mode 100644
index 000000000..1845e7a8f
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_outgoing_document_layout.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top"
+    android:gravity="right">
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_height="wrap_content"
+        android:layout_width="140dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginLeft="10dp"
+        android:id="@+id/chat_view_action_layout"
+        android:layout_gravity="center"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:scaleType="centerInside"
+            android:layout_marginLeft="4dp"
+            android:id="@+id/chat_view_action_cancel_button"
+            android:src="@drawable/ic_msg_btn_cross_custom"
+            android:layout_gravity="left|center"
+            android:clickable="true"/>
+
+        <ProgressBar
+            android:layout_width="fill_parent"
+            android:layout_height="3dp"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:progress="50"
+            android:layout_marginLeft="36dp"
+            android:layout_marginRight="12dp"
+            android:layout_gravity="right|center_vertical"
+            android:progressDrawable="@drawable/photo_progress_chat"
+            android:id="@+id/chat_view_action_progress"
+            android:max="100"/>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/DOWNLOAD"
+        android:textColor="#54759e"
+        android:background="@drawable/chat_incoming_media_states"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:id="@+id/chat_view_action_button"
+        android:textSize="14dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginLeft="10dp"
+        android:descendantFocusability="blocksDescendants"
+        android:clickable="true"
+        android:gravity="center"
+        android:visibility="gone"
+        android:textStyle="bold"
+        android:layout_gravity="center"/>
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_height="78dp"
+        android:layout_width="wrap_content"
+        android:paddingTop="9dp"
+        android:paddingLeft="9dp"
+        android:paddingRight="18dp"
+        android:layout_gravity="top|right"
+        android:id="@+id/chat_bubble_layout">
+
+        <org.telegram.ui.Views.FrameLayoutFixed
+            android:layout_height="69dp"
+            android:layout_width="wrap_content"
+            android:layout_gravity="top|right"
+            android:id="@+id/shared_layout">
+
+            <org.telegram.ui.Views.BackupImageView
+                android:layout_width="42dp"
+                android:layout_height="42dp"
+                android:background="#408ed057"
+                android:src="@drawable/doc_green"
+                android:scaleType="center"
+                android:id="@+id/contact_avatar"/>
+
+            <org.telegram.ui.Views.TightTextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:scrollHorizontally="true"
+                android:layout_marginTop="3dp"
+                android:textSize="14dp"
+                android:lines="1"
+                android:singleLine="true"
+                android:layout_marginRight="2dp"
+                android:layout_gravity="top"
+                android:ellipsize="end"
+                android:textColor="#000000"
+                android:id="@+id/chat_user_group_name"
+                android:layout_marginLeft="50dp"/>
+
+            <org.telegram.ui.Views.TightTextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginLeft="50dp"
+                android:layout_marginTop="22dp"
+                android:layout_gravity="top"
+                android:layout_marginRight="2dp"
+                android:textSize="11dp"
+                android:maxLines="1"
+                android:textColor="#75b166"
+                android:id="@+id/phone_text_view"/>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/chat_time_layout"
+                android:layout_gravity="bottom|right"
+                android:layout_marginBottom="5dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/chat_time_text"
+                    android:textColor="#70b15c"
+                    android:textSize="12dp"/>
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/msg_check"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="-8dp"
+                    android:id="@+id/chat_row_check"
+                    android:visibility="visible"
+                    android:layout_gravity="top"/>
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/msg_halfcheck"
+                    android:layout_marginTop="2dp"
+                    android:id="@+id/chat_row_halfcheck"
+                    android:visibility="visible"
+                    android:layout_gravity="top"/>
+
+            </LinearLayout>
+
+        </org.telegram.ui.Views.FrameLayoutFixed>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_outgoing_forward_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_outgoing_forward_layout.xml
new file mode 100644
index 000000000..b673b56e1
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_outgoing_forward_layout.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.MessageLayout
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:id="@+id/message_layout"
+        android:layout_gravity="right">
+
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:textColor="#4a923c"
+            android:textSize="14dp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:text="@string/ForwardedMessage"
+            android:layout_gravity="top|left"
+            android:id="@+id/chat_text_forward_text"/>
+
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:id="@+id/chat_text_forward_name"
+            android:textColor="#4a923c"
+            android:textSize="14dp"
+            android:layout_marginTop="16dp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:layout_gravity="top|left"/>
+
+        <org.telegram.ui.Views.TightTextView
+            android:id="@+id/chat_message_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16dp"
+            android:linksClickable="false"
+            android:layout_marginTop="34dp"
+            android:layout_marginBottom="8dp"
+            android:autoLink="web|email"
+            android:descendantFocusability="afterDescendants"
+            android:layout_gravity="top"
+            android:textColor="#000000"
+            android:textColorLink="#316f9f"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/chat_time_layout"
+            android:layout_gravity="bottom|right">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/chat_time_text"
+                android:textColor="#70b15c"
+                android:textSize="12dp"
+                android:paddingBottom="5dp"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/msg_check"
+                android:layout_marginTop="2dp"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="-8dp"
+                android:id="@+id/chat_row_check"
+                android:visibility="visible"
+                android:layout_gravity="top"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/msg_halfcheck"
+                android:layout_marginTop="2dp"
+                android:id="@+id/chat_row_halfcheck"
+                android:visibility="visible"
+                android:layout_gravity="top"/>
+
+        </LinearLayout>
+
+    </org.telegram.ui.Views.MessageLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_outgoing_location_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_outgoing_location_layout.xml
new file mode 100644
index 000000000..4da0f2f20
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_outgoing_location_layout.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="right"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/ViewLocation"
+        android:textColor="#54759e"
+        android:background="@drawable/chat_incoming_media_states"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:id="@+id/chat_view_action_button"
+        android:textSize="14dp"
+        android:layout_marginRight="10dp"
+        android:textStyle="bold"
+        android:descendantFocusability="blocksDescendants"
+        android:clickable="true"
+        android:gravity="center"
+        android:layout_gravity="center"/>
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="9dp"
+        android:id="@+id/chat_bubble_layout"
+        android:layout_gravity="top"
+        android:addStatesFromChildren="true">
+
+        <org.telegram.ui.Views.BackupImageView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_margin="6dp"
+            android:layout_gravity="top"
+            android:scaleType="centerCrop"
+            android:minHeight="100dp"
+            android:minWidth="100dp"
+            android:id="@+id/chat_photo_image"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:id="@+id/chat_time_layout"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
+            android:paddingBottom="1dp"
+            android:paddingTop="1dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_gravity="right|bottom"
+            android:background="@drawable/phototime">
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:textColor="#ffffff"
+                android:textSize="12dp"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="1dp"
+                android:id="@+id/chat_time_text"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/msg_check_w"
+                android:layout_marginTop="1dp"
+                android:layout_marginLeft="3dp"
+                android:layout_marginRight="-8dp"
+                android:id="@+id/chat_row_check"
+                android:visibility="visible"
+                android:layout_gravity="top"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="1dp"
+                android:id="@+id/chat_row_halfcheck"
+                android:visibility="visible"
+                android:src="@drawable/msg_halfcheck_w"
+                android:layout_gravity="top"/>
+
+        </LinearLayout>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_outgoing_photo_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_outgoing_photo_layout.xml
new file mode 100644
index 000000000..cb6b899b7
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_outgoing_photo_layout.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="right"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp">
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_height="wrap_content"
+        android:layout_width="140dp"
+        android:layout_marginRight="10dp"
+        android:id="@+id/chat_view_action_layout"
+        android:layout_gravity="center"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:scaleType="centerInside"
+            android:layout_marginLeft="4dp"
+            android:id="@+id/chat_view_action_cancel_button"
+            android:src="@drawable/ic_msg_btn_cross_custom"
+            android:layout_gravity="left|center"
+            android:clickable="true"/>
+
+        <ProgressBar
+            android:layout_width="fill_parent"
+            android:layout_height="3dp"
+            android:layout_gravity="right|center_vertical"
+            android:progressDrawable="@drawable/photo_progress_chat"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:progress="50"
+            android:layout_marginLeft="36dp"
+            android:layout_marginRight="12dp"
+            android:id="@+id/chat_view_action_progress"
+            android:max="100"/>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/ViewPhoto"
+        android:textColor="#54759e"
+        android:background="@drawable/chat_incoming_media_states"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:id="@+id/chat_view_action_button"
+        android:textSize="14dp"
+        android:layout_marginRight="10dp"
+        android:descendantFocusability="blocksDescendants"
+        android:clickable="true"
+        android:gravity="center"
+        android:textStyle="bold"
+        android:layout_gravity="center"
+        android:visibility="gone"/>
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="9dp"
+        android:id="@+id/chat_bubble_layout"
+        android:addStatesFromChildren="true">
+
+        <org.telegram.ui.Views.BackupImageView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_margin="6dp"
+            android:layout_gravity="top|left"
+            android:scaleType="centerCrop"
+            android:minHeight="100dp"
+            android:minWidth="100dp"
+            android:id="@+id/chat_photo_image"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:id="@+id/chat_time_layout"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
+            android:paddingBottom="1dp"
+            android:paddingTop="1dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_gravity="right|bottom"
+            android:background="@drawable/phototime">
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:textColor="#ffffff"
+                android:textSize="12dp"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="1dp"
+                android:id="@+id/chat_time_text"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/msg_check_w"
+                android:layout_marginTop="1dp"
+                android:layout_marginLeft="3dp"
+                android:layout_marginRight="-8dp"
+                android:id="@+id/chat_row_check"
+                android:visibility="visible"
+                android:layout_gravity="top"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="1dp"
+                android:id="@+id/chat_row_halfcheck"
+                android:visibility="visible"
+                android:src="@drawable/msg_halfcheck_w"
+                android:layout_gravity="top"/>
+
+        </LinearLayout>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_outgoing_text_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_outgoing_text_layout.xml
new file mode 100644
index 000000000..4861b6d63
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_outgoing_text_layout.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.MessageLayout
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:id="@+id/message_layout"
+        android:layout_gravity="right">
+
+        <org.telegram.ui.Views.TightTextView
+            android:id="@+id/chat_message_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16dp"
+            android:autoLink="web|email"
+            android:linksClickable="false"
+            android:layout_gravity="top"
+            android:textColor="#000000"
+            android:layout_marginBottom="8dp"
+            android:textColorLink="#316f9f"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/chat_time_layout"
+            android:layout_gravity="bottom|right">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/chat_time_text"
+                android:textColor="#70b15c"
+                android:textSize="12dp"
+                android:paddingBottom="5dp"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/msg_check"
+                android:layout_marginTop="2dp"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="-8dp"
+                android:id="@+id/chat_row_check"
+                android:visibility="visible"
+                android:layout_gravity="top"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/msg_halfcheck"
+                android:layout_marginTop="2dp"
+                android:id="@+id/chat_row_halfcheck"
+                android:visibility="visible"
+                android:layout_gravity="top"/>
+
+        </LinearLayout>
+
+    </org.telegram.ui.Views.MessageLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_outgoing_video_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_outgoing_video_layout.xml
new file mode 100644
index 000000000..3c6b1f8a2
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_outgoing_video_layout.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="right"
+    android:paddingBottom="1dp"
+    android:paddingTop="1dp">
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_height="wrap_content"
+        android:layout_width="140dp"
+        android:layout_marginRight="10dp"
+        android:id="@+id/chat_view_action_layout"
+        android:layout_gravity="center"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:scaleType="centerInside"
+            android:layout_marginLeft="4dp"
+            android:id="@+id/chat_view_action_cancel_button"
+            android:src="@drawable/ic_msg_btn_cross_custom"
+            android:layout_gravity="left|center"
+            android:clickable="true"/>
+
+        <ProgressBar
+            android:layout_width="fill_parent"
+            android:layout_height="3dp"
+            android:layout_gravity="right|center_vertical"
+            android:progressDrawable="@drawable/photo_progress_chat"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:progress="50"
+            android:layout_marginLeft="36dp"
+            android:layout_marginRight="12dp"
+            android:id="@+id/chat_view_action_progress"
+            android:max="100"/>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/ViewVideo"
+        android:textColor="#54759e"
+        android:background="@drawable/chat_incoming_media_states"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:id="@+id/chat_view_action_button"
+        android:textSize="14dp"
+        android:layout_marginRight="10dp"
+        android:descendantFocusability="blocksDescendants"
+        android:clickable="true"
+        android:gravity="center"
+        android:visibility="gone"
+        android:textStyle="bold"
+        android:layout_gravity="center"/>
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="9dp"
+        android:id="@+id/chat_bubble_layout"
+        android:layout_gravity="top"
+        android:addStatesFromChildren="true">
+
+        <org.telegram.ui.Views.BackupImageView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_margin="6dp"
+            android:layout_gravity="top"
+            android:scaleType="centerCrop"
+            android:minHeight="100dp"
+            android:minWidth="100dp"
+            android:id="@+id/chat_photo_image"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_gravity="top"
+            android:background="@drawable/phototime"
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:src="@drawable/ic_video"/>
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:textColor="#ffffff"
+                android:textSize="12dp"
+                android:layout_marginLeft="4dp"
+                android:gravity="center_vertical"
+                android:layout_gravity="center_vertical"
+                android:layout_marginBottom="1dp"
+                android:id="@+id/chat_video_time"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:id="@+id/chat_time_layout"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
+            android:paddingBottom="1dp"
+            android:paddingTop="1dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_gravity="right|bottom"
+            android:background="@drawable/phototime">
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:textColor="#ffffff"
+                android:textSize="12dp"
+                android:layout_gravity="bottom"
+                android:id="@+id/chat_time_text"
+                android:layout_marginBottom="1dp"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/msg_check_w"
+                android:layout_marginTop="1dp"
+                android:layout_marginLeft="3dp"
+                android:layout_marginRight="-8dp"
+                android:id="@+id/chat_row_check"
+                android:visibility="visible"
+                android:layout_gravity="top"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="1dp"
+                android:id="@+id/chat_row_halfcheck"
+                android:visibility="visible"
+                android:src="@drawable/msg_halfcheck_w"
+                android:layout_gravity="top"/>
+
+        </LinearLayout>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_profile_add_row.xml b/TMessagesProj/src/main/res/layout-es/chat_profile_add_row.xml
new file mode 100644
index 000000000..a2cf812cf
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_profile_add_row.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="66dp">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/messages_list_row_avatar"
+        android:contentDescription=""
+        android:src="@drawable/addmember"
+        android:scaleType="center"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="24dp"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/messages_list_row_name"
+        android:textSize="18dp"
+        android:layout_marginLeft="61dp"
+        android:ellipsize="end"
+        android:textColor="#000000"
+        android:text="@string/AddMember"
+        android:maxLines="1"
+        android:layout_gravity="center_vertical"/>
+
+    <View android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_profile_avatar_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_profile_avatar_layout.xml
new file mode 100644
index 000000000..85f4a3d4d
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_profile_avatar_layout.xml
@@ -0,0 +1,74 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="13dp"
+    android:paddingBottom="12dp">
+
+    <FrameLayout
+        android:layout_width="64dp"
+        android:layout_height="64dp">
+
+        <org.telegram.ui.Views.BackupImageView
+            android:id="@+id/settings_avatar_image"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"/>
+
+        <ImageButton
+            android:id="@+id/settings_change_avatar_button"
+            android:background="@drawable/photo_spinner"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"/>
+
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="13dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginBottom="1dp"
+        android:layout_weight="1">
+
+        <TextView
+            android:textSize="21dp"
+            android:textColor="#333333"
+            android:id="@+id/settings_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:lines="1"
+            android:ellipsize="end"
+            android:singleLine="true"/>
+
+        <TextView
+            android:textSize="14dp"
+            android:textColor="#999999"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:maxLines="1"
+            android:lines="1"
+            android:ellipsize="end"
+            android:id="@+id/settings_online"/>
+
+    </LinearLayout>
+
+    <View
+        android:background="#e8e8e8"
+        android:layout_width="1dp"
+        android:layout_height="48dp"/>
+
+    <ImageButton
+        android:id="@+id/settings_edit_name"
+        android:background="@drawable/list_selector"
+        android:clickable="true"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:src="@drawable/ic_edit"/>
+
+</LinearLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/chat_profile_change_name_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_profile_change_name_layout.xml
new file mode 100644
index 000000000..a50171b4b
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_profile_change_name_layout.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingTop="8dp">
+
+        <include layout="@layout/settings_section_layout"/>
+
+        <EditText
+            android:textSize="19dp"
+            android:textColorHint="#a3a3a3"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/first_name_field"
+            android:paddingBottom="15dp"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:hint="@string/GroupName"
+            android:maxLines="3"
+            android:inputType="textCapSentences|textAutoCorrect|textMultiLine"
+            android:imeOptions="actionDone"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp"
+            android:textCursorDrawable="@null"
+            android:textColor="#000000"/>
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/chat_profile_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_profile_layout.xml
new file mode 100644
index 000000000..57fd376dc
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_profile_layout.xml
@@ -0,0 +1,23 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#fafafa">
+
+    <ListView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/listView"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:clipToPadding="false"
+        android:fadingEdge="none"
+        android:fadingEdgeLength="0dp"
+        android:paddingLeft="13dp"
+        android:paddingRight="13dp"
+        android:dividerHeight="0dp"
+        android:divider="@null"
+        android:scrollbars="none"
+        android:paddingBottom="16dp"/>
+
+</RelativeLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/chat_unread_layout.xml b/TMessagesProj/src/main/res/layout-es/chat_unread_layout.xml
new file mode 100644
index 000000000..31c3cf3f1
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/chat_unread_layout.xml
@@ -0,0 +1,31 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="40dp">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="27dp"
+        android:background="@drawable/newmsg_divider"
+        android:layout_marginTop="7dp">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_ab_new"
+            android:layout_gravity="right|center_vertical"
+            android:layout_marginRight="10dp"
+            android:paddingTop="2dp"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textColor="#4a7297"
+            android:textSize="14dp"
+            android:id="@+id/chat_message_text"
+            android:paddingBottom="1dp"/>
+
+    </FrameLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/contact_add_layout.xml b/TMessagesProj/src/main/res/layout-es/contact_add_layout.xml
new file mode 100644
index 000000000..32faaaaad
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/contact_add_layout.xml
@@ -0,0 +1,97 @@
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:layout_gravity="top">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp">
+
+            <org.telegram.ui.Views.BackupImageView
+                android:id="@+id/settings_avatar_image"
+                android:layout_width="64dp"
+                android:layout_height="64dp"/>
+
+            <LinearLayout
+                android:layout_gravity="center_vertical"
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="13dp"
+                android:layout_marginBottom="1dp">
+
+                <TextView
+                    android:textSize="21dp"
+                    android:textColor="#333333"
+                    android:ellipsize="end"
+                    android:id="@+id/settings_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:lines="1"
+                    android:singleLine="true"/>
+
+                <TextView
+                    android:textSize="14dp"
+                    android:textColor="#999999"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:id="@+id/settings_online"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <EditText
+            android:textSize="19dp"
+            android:textColorHint="#a3a3a3"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/first_name_field"
+            android:paddingBottom="15dp"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:hint="@string/FirstName"
+            android:lines="1"
+            android:singleLine="true"
+            android:inputType="textCapSentences|textAutoCorrect"
+            android:imeOptions="actionNext"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp"
+            android:textCursorDrawable="@null"
+            android:textColor="#000000"/>
+
+        <EditText
+            android:textSize="19dp"
+            android:textColorHint="#a3a3a3"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/last_name_field"
+            android:paddingBottom="15dp"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:hint="@string/LastName"
+            android:lines="1"
+            android:singleLine="true"
+            android:inputType="textCapSentences|textAutoCorrect"
+            android:imeOptions="actionDone"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp"
+            android:textCursorDrawable="@null"
+            android:textColor="#000000"/>
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/contacts_invite_row_layout.xml b/TMessagesProj/src/main/res/layout-es/contacts_invite_row_layout.xml
new file mode 100644
index 000000000..6ff3cb15b
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/contacts_invite_row_layout.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="66dp"
+    android:layout_gravity="top">
+
+    <ImageView
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:id="@+id/messages_list_row_avatar"
+        android:src="@drawable/ic_ab_share"
+        android:contentDescription=""
+        android:scaleType="center"
+        android:layout_marginTop="8dp"
+        android:layout_gravity="top"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/messages_list_row_name"
+        android:textSize="18dp"
+        android:layout_marginLeft="61dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="@string/InviteFriends"
+        android:textColor="#006fc8"
+        android:layout_gravity="center_vertical"/>
+
+    <View android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"
+        android:visibility="gone"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/contacts_layout.xml b/TMessagesProj/src/main/res/layout-es/contacts_layout.xml
new file mode 100644
index 000000000..5ccb02758
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/contacts_layout.xml
@@ -0,0 +1,33 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
+
+    <org.telegram.ui.Views.PinnedHeaderListView
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:id="@+id/listView"
+            android:clipToPadding="false"
+            android:fadingEdge="none"
+            android:fadingEdgeLength="0dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="30dp"
+            android:dividerHeight="0dp"
+            android:divider="@null"
+            android:paddingBottom="16dp"
+            android:fastScrollEnabled="true"
+            android:fastScrollAlwaysVisible="true"
+            android:scrollbarStyle="outsideOverlay"
+            android:layout_gravity="top"/>
+
+
+    <TextView android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:textColor="#808080"
+            android:gravity="center"
+            android:text="@string/NoContacts"
+            android:textSize="24dp"
+            android:id="@+id/searchEmptyView"
+            android:visibility="invisible"
+            android:layout_gravity="top"/>
+
+</FrameLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/country_row_layout.xml b/TMessagesProj/src/main/res/layout-es/country_row_layout.xml
new file mode 100644
index 000000000..923d7f9bd
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/country_row_layout.xml
@@ -0,0 +1,36 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="50dp"
+    android:layout_gravity="top">
+
+    <TextView
+        android:textSize="18dp"
+        android:textColor="#333333"
+        android:id="@+id/settings_row_text"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="8dp"
+        android:gravity="center_vertical"
+        android:layout_gravity="top"/>
+
+    <TextView
+        android:textSize="18dp"
+        android:textColor="#999999"
+        android:id="@+id/settings_row_text_detail"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="12dp"
+        android:gravity="center_vertical"
+        android:layout_gravity="right"/>
+
+    <View
+        android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/country_select_layout.xml b/TMessagesProj/src/main/res/layout-es/country_select_layout.xml
new file mode 100644
index 000000000..b4c246ee8
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/country_select_layout.xml
@@ -0,0 +1,35 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="#fafafa">
+
+    <org.telegram.ui.Views.PinnedHeaderListView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/listView"
+        android:clipToPadding="false"
+        android:fadingEdge="none"
+        android:fadingEdgeLength="0dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="30dp"
+        android:dividerHeight="0dp"
+        android:divider="@null"
+        android:paddingBottom="16dp"
+        android:fastScrollEnabled="true"
+        android:fastScrollAlwaysVisible="true"
+        android:scrollbarStyle="outsideOverlay"
+        android:layout_gravity="top"/>
+
+
+    <TextView android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:textColor="#808080"
+        android:gravity="center"
+        android:text="@string/NoResult"
+        android:textSize="24dp"
+        android:id="@+id/searchEmptyView"
+        android:visibility="invisible"
+        android:layout_gravity="top"/>
+
+</FrameLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/document_item.xml b/TMessagesProj/src/main/res/layout-es/document_item.xml
new file mode 100644
index 000000000..aa20aba2b
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/document_item.xml
@@ -0,0 +1,73 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/HLRelativeLayout1"
+    android:layout_width="match_parent"
+    android:layout_height="64dp"
+    android:paddingLeft="13dp"
+    android:paddingRight="13dp">
+
+    <TextView
+        android:id="@+id/docs_item_type"
+        android:layout_width="55dp"
+        android:layout_height="42dp"
+        android:layout_marginTop="11dp"
+        android:background="#1A808080"
+        android:ellipsize="marquee"
+        android:gravity="center"
+        android:padding="5dp"
+        android:singleLine="true"
+        android:textColor="#919191"
+        android:textSize="16dp"
+        android:textStyle="bold"
+        android:layout_gravity="top|left"/>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="62dp"
+        android:layout_marginRight="7dp"
+        android:layout_marginLeft="66dp"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:layout_gravity="top|left">
+
+        <TextView
+            android:id="@+id/docs_item_title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="TextView"
+            android:textColor="#000"
+            android:textSize="18dp"
+            android:layout_gravity="top|left"/>
+
+        <TextView
+            android:id="@+id/docs_item_info"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="TextView"
+            android:textColor="#a6a6a6"
+            android:textSize="16dp"
+            android:layout_gravity="top|left"/>
+
+    </LinearLayout>
+
+    <org.telegram.ui.Views.BackupImageView
+        android:id="@+id/docs_item_thumb"
+        android:layout_width="55dp"
+        android:layout_height="42dp"
+        android:scaleType="centerCrop"
+        android:layout_marginTop="11dp"
+        android:layout_gravity="top|left"/>
+
+    <View
+        android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/document_select_layout.xml b/TMessagesProj/src/main/res/layout-es/document_select_layout.xml
new file mode 100644
index 000000000..bb2811e8a
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/document_select_layout.xml
@@ -0,0 +1,28 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/listView"
+        android:clipToPadding="false"
+        android:fadingEdge="none"
+        android:fadingEdgeLength="0dp"
+        android:dividerHeight="0dp"
+        android:divider="@null"
+        android:scrollbars="none"
+        android:cacheColorHint="#ffffffff"/>
+
+    <TextView android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:textColor="#808080"
+        android:gravity="center"
+        android:text="@string/NoFiles"
+        android:textSize="24dp"
+        android:id="@+id/searchEmptyView"
+        android:visibility="gone"
+        android:layout_gravity="top"/>
+
+</FrameLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/empty_layout.xml b/TMessagesProj/src/main/res/layout-es/empty_layout.xml
new file mode 100644
index 000000000..26e058fd9
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/empty_layout.xml
@@ -0,0 +1,5 @@
+<FrameLayout
+        android:layout_width="1px"
+        android:layout_height="fill_parent"
+        xmlns:android="http://schemas.android.com/apk/res/android">
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/encrypted_chat_placeholder.xml b/TMessagesProj/src/main/res/layout-es/encrypted_chat_placeholder.xml
new file mode 100644
index 000000000..a69e42703
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/encrypted_chat_placeholder.xml
@@ -0,0 +1,78 @@
+<LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
+    android:layout_gravity="center"
+    android:padding="20dp"
+    android:layout_centerInParent="true"
+    android:id="@+id/secret_placeholder"
+    android:orientation="vertical"
+    android:visibility="gone"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <TextView android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:id="@+id/invite_text"
+        android:maxWidth="210dp"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_horizontal"
+        android:textColor="#ffffff"
+        android:textSize="15dp"/>
+
+    <TextView android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginTop="8dp"
+        android:maxWidth="260dp"
+        android:gravity="center_horizontal"
+        android:textColor="#ffffff"
+        android:textSize="15dp"
+        android:text="@string/EncryptedDescriptionTitle"/>
+
+    <TextView android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginTop="8dp"
+        android:maxWidth="260dp"
+        android:gravity="center_vertical"
+        android:textColor="#ffffff"
+        android:textSize="15dp"
+        android:id="@+id/secret_description1"
+        android:text="@string/EncryptedDescription1"
+        android:drawableLeft="@drawable/ic_lock_white"
+        android:drawablePadding="8dp"/>
+
+    <TextView android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginTop="4dp"
+        android:maxWidth="260dp"
+        android:gravity="center_vertical"
+        android:textColor="#ffffff"
+        android:textSize="15dp"
+        android:id="@+id/secret_description2"
+        android:text="@string/EncryptedDescription2"
+        android:drawableLeft="@drawable/ic_lock_white"
+        android:drawablePadding="8dp"/>
+
+    <TextView android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginTop="4dp"
+        android:maxWidth="260dp"
+        android:gravity="center_vertical"
+        android:textColor="#ffffff"
+        android:textSize="15dp"
+        android:id="@+id/secret_description3"
+        android:text="@string/EncryptedDescription3"
+        android:drawableLeft="@drawable/ic_lock_white"
+        android:drawablePadding="8dp"/>
+
+    <TextView android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginTop="4dp"
+        android:maxWidth="260dp"
+        android:gravity="center_vertical"
+        android:textColor="#ffffff"
+        android:textSize="15dp"
+        android:id="@+id/secret_description4"
+        android:text="@string/EncryptedDescription4"
+        android:drawableLeft="@drawable/ic_lock_white"
+        android:drawablePadding="8dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/gallery_layout.xml b/TMessagesProj/src/main/res/layout-es/gallery_layout.xml
new file mode 100644
index 000000000..916b9cd78
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/gallery_layout.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="#00000000"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.GalleryViewPager
+        android:id="@+id/gallery_view_pager"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_gravity="top"/>
+
+    <ProgressBar
+        android:layout_width="fill_parent"
+        android:layout_height="3dp"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:progress="50"
+        android:layout_gravity="bottom|center_horizontal"
+        android:id="@+id/action_progress"
+        android:max="100"
+        android:progressDrawable="@drawable/photo_progress"
+        android:layout_marginBottom="48dp"
+        android:layout_marginLeft="6dp"
+        android:layout_marginRight="6dp"/>
+
+    <FrameLayout
+        android:layout_width="fill_parent"
+        android:layout_height="48dp"
+        android:layout_gravity="bottom"
+        android:background="#dd000000"
+        android:id="@+id/gallery_view_bottom_view">
+
+        <ImageView
+            android:layout_height="fill_parent"
+            android:layout_width="50dp"
+            android:src="@drawable/ic_ab_share_white"
+            android:scaleType="center"
+            android:id="@+id/gallery_view_share_button"
+            android:background="@drawable/list_selector"/>
+
+        <ImageView
+            android:layout_height="fill_parent"
+            android:layout_width="50dp"
+            android:src="@drawable/ic_ab_delete_white"
+            android:scaleType="center"
+            android:layout_gravity="right"
+            android:id="@+id/gallery_view_delete_button"
+            android:background="@drawable/list_selector"/>
+
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
+            android:layout_marginLeft="60dp"
+            android:layout_marginRight="60dp"
+            android:textSize="17dp"
+            android:maxLines="1"
+            android:textColor="#ffffff"
+            android:gravity="center"
+            android:layout_marginTop="2dp"
+            android:id="@+id/gallery_view_name_text"
+            android:layout_gravity="top"/>
+
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
+            android:layout_marginLeft="60dp"
+            android:layout_marginRight="60dp"
+            android:layout_marginTop="26dp"
+            android:gravity="center"
+            android:textColor="#b8bdbe"
+            android:textSize="14dp"
+            android:id="@+id/gallery_view_time_text"
+            android:layout_gravity="top"/>
+
+    </FrameLayout>
+
+    <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginTop="-70dp"
+        android:id="@+id/fake_title_view"
+        android:textSize="18dp"
+        android:layout_gravity="top|left"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/gallery_page_layout.xml b/TMessagesProj/src/main/res/layout-es/gallery_page_layout.xml
new file mode 100644
index 000000000..d9dbb8b07
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/gallery_page_layout.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<FrameLayout
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <org.telegram.ui.Views.PZSImageView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/page_image"/>
+
+    <TextView android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_gravity="center"
+        android:textSize="26dp"
+        android:textColor="#ffffff"
+        android:background="@drawable/system_black"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:paddingTop="2dp"
+        android:paddingBottom="2dp"
+        android:clickable="true"
+        android:visibility="gone"
+        android:id="@+id/action_button"/>
+
+</FrameLayout>
+
diff --git a/TMessagesProj/src/main/res/layout-es/group_create_bubble.xml b/TMessagesProj/src/main/res/layout-es/group_create_bubble.xml
new file mode 100644
index 000000000..c6c981b39
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/group_create_bubble.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="41dp"
+        android:paddingRight="9dp"
+        android:paddingTop="9dp"
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
+<TextView android:layout_width="wrap_content"
+          android:layout_height="31dp"
+          android:background="@drawable/chat_create_bubble_states"
+          android:textSize="16dp"
+          android:paddingRight="8dp"
+          android:paddingLeft="8dp"
+          android:gravity="center"
+          android:textColor="@color/chat_create_bubble_text_states"
+          android:id="@+id/bubble_text_view"/>
+</FrameLayout>
+
diff --git a/TMessagesProj/src/main/res/layout-es/group_create_done_layout.xml b/TMessagesProj/src/main/res/layout-es/group_create_done_layout.xml
new file mode 100644
index 000000000..6a8fc503d
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/group_create_done_layout.xml
@@ -0,0 +1,24 @@
+<FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_gravity="right|center_vertical"
+    android:minHeight="60dp">
+
+    <TextView android:layout_height="fill_parent"
+            android:layout_width="wrap_content"
+            android:text="@string/Done"
+            android:drawableLeft="@drawable/ic_done"
+            android:textColor="#ffffff"
+            android:textSize="14dp"
+            android:textStyle="bold"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:id="@+id/done_button"
+            android:drawablePadding="8dp"
+            android:paddingRight="16dp"
+            android:paddingLeft="16dp"
+            android:background="@drawable/bar_selector"
+        android:minHeight="60dp"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/group_create_final_layout.xml b/TMessagesProj/src/main/res/layout-es/group_create_final_layout.xml
new file mode 100644
index 000000000..36489cbcd
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/group_create_final_layout.xml
@@ -0,0 +1,70 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical">
+
+    <FrameLayout android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:id="@+id/top_layout"
+                 android:layout_gravity="top">
+
+        <FrameLayout android:layout_width="64dp"
+                     android:layout_height="64dp"
+                     android:layout_marginTop="12dp"
+                     android:layout_marginBottom="12dp"
+                     android:layout_marginLeft="16dp"
+                     android:layout_gravity="top">
+
+            <org.telegram.ui.Views.BackupImageView
+                android:id="@+id/settings_avatar_image"
+                                       android:layout_width="fill_parent"
+                                       android:layout_height="fill_parent"
+                                       android:src="@drawable/group_blue"/>
+
+            <ImageButton android:id="@+id/settings_change_avatar_button"
+                         android:background="@drawable/photo_spinner"
+                         android:layout_width="fill_parent"
+                         android:layout_height="fill_parent"/>
+        </FrameLayout>
+
+        <EditText
+            android:textSize="18dp"
+            android:textColorHint="#a6a6a6"
+            android:id="@+id/bubble_input_text"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="96dp"
+            android:layout_marginRight="16dp"
+            android:minHeight="52dp"
+            android:hint="@string/EnterGroupNamePlaceholder"
+            android:maxLines="4"
+            android:paddingTop="0dp"
+            android:layout_marginTop="0dp"
+            android:gravity="left|center_vertical"
+            android:imeOptions="flagNoExtractUi"
+            android:layout_gravity="center_vertical"
+            android:textCursorDrawable="@null"
+            android:textColor="#000000"/>
+
+    </FrameLayout>
+
+
+    <FrameLayout android:layout_width="match_parent"
+                 android:layout_height="match_parent">
+
+        <org.telegram.ui.Views.PinnedHeaderListView
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:id="@+id/listView"
+                android:clipToPadding="false"
+                android:fadingEdge="none"
+                android:fadingEdgeLength="0dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:dividerHeight="0dp"
+                android:divider="@null"
+                android:paddingBottom="16dp"
+                android:scrollbars="none"/>
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/group_create_layout.xml b/TMessagesProj/src/main/res/layout-es/group_create_layout.xml
new file mode 100644
index 000000000..523a73ec2
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/group_create_layout.xml
@@ -0,0 +1,80 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/top_layout"
+        android:layout_gravity="top">
+
+        <EditText
+            android:textSize="16dp"
+            android:textColorHint="#a6a6a6"
+            android:id="@+id/bubble_input_text"
+            android:paddingRight="60dp"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:minHeight="52dp"
+            android:gravity="left|center_vertical"
+            android:hint="@string/SendMessageTo"
+            android:maxLines="3"
+            android:paddingTop="3dp"
+            android:layout_marginTop="0dp"
+            android:inputType="textFilter|textNoSuggestions|textMultiLine"
+            android:imeOptions="flagNoExtractUi"
+            android:textCursorDrawable="@null"
+            android:textColor="#000000"/>
+
+        <TextView
+            android:textSize="16dp"
+            android:textColor="#a6a6a6"
+            android:gravity="center_vertical"
+            android:layout_gravity="top|right|center"
+            android:id="@+id/bubble_counter_text"
+            android:layout_width="wrap_content"
+            android:layout_height="52dp"
+            android:layout_marginRight="16dp"
+            android:paddingBottom="4dp"
+            android:text="0/200"/>
+
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <org.telegram.ui.Views.PinnedHeaderListView
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:id="@+id/listView"
+            android:clipToPadding="false"
+            android:fadingEdge="none"
+            android:fadingEdgeLength="0dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="30dp"
+            android:dividerHeight="0dp"
+            android:divider="@null"
+            android:paddingBottom="16dp"
+            android:fastScrollEnabled="true"
+            android:fastScrollAlwaysVisible="true"
+            android:scrollbarStyle="outsideOverlay"/>
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:textColor="#808080"
+            android:gravity="center"
+            android:text="@string/NoContacts"
+            android:textSize="24dp"
+            android:id="@+id/searchEmptyView"
+            android:visibility="invisible"/>
+
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/group_create_row_layout.xml b/TMessagesProj/src/main/res/layout-es/group_create_row_layout.xml
new file mode 100644
index 000000000..7809160c8
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/group_create_row_layout.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="66dp"
+             android:layout_gravity="top">
+
+    <org.telegram.ui.Views.BackupImageView
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:id="@+id/messages_list_row_avatar"
+            android:contentDescription=""
+            android:layout_marginTop="8dp"
+            android:layout_gravity="top"/>
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/messages_list_row_name"
+            android:textSize="18dp"
+            android:layout_marginLeft="61dp"
+            android:ellipsize="end"
+            android:layout_marginTop="10dp"
+            android:maxLines="1"
+            android:textColor="#000000"
+            android:layout_marginRight="60dp"
+            android:layout_gravity="top"/>
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/messages_list_row_message"
+            android:textSize="15dp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:textColor="#808080"
+            android:layout_marginLeft="61dp"
+            android:layout_marginTop="34dp"
+            android:layout_marginRight="60dp"
+            android:layout_gravity="top"/>
+
+    <ImageView android:layout_gravity="center_vertical|right"
+               android:id="@+id/settings_row_check_button"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:layout_marginRight="14dp"
+               android:src="@drawable/btn_check_off_old"/>
+
+    <View android:background="@color/divider"
+          android:layout_width="fill_parent"
+          android:layout_height="1px"
+          android:layout_gravity="bottom"
+          android:id="@+id/settings_row_divider"
+          android:visibility="gone"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/group_profile_add_member_layout.xml b/TMessagesProj/src/main/res/layout-es/group_profile_add_member_layout.xml
new file mode 100644
index 000000000..84aeda0fb
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/group_profile_add_member_layout.xml
@@ -0,0 +1,30 @@
+<!--
+  ~ This is the source code of Telegram for Android v. 1.2.9.
+  ~ It is licensed under GNU GPL v. 2 or later.
+  ~ You should have received a copy of the license in this archive (see LICENSE).
+  ~
+  ~ Copyright Nikolai Kudashov, 2013.
+  -->
+
+<FrameLayout
+    android:layout_width="wrap_content"
+    android:layout_height="fill_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_gravity="right|center_vertical"
+    android:minHeight="60dp">
+
+    <TextView android:layout_height="fill_parent"
+        android:layout_width="wrap_content"
+        android:text="@string/AddMember"
+        android:textColor="#ffffff"
+        android:textSize="14dp"
+        android:textStyle="bold"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:id="@+id/done_button"
+        android:paddingRight="16dp"
+        android:paddingLeft="16dp"
+        android:background="@drawable/bar_selector"
+        android:minHeight="60dp"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/identicon_layout.xml b/TMessagesProj/src/main/res/layout-es/identicon_layout.xml
new file mode 100644
index 000000000..1b4dac4d7
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/identicon_layout.xml
@@ -0,0 +1,45 @@
+<LinearLayout
+    android:layout_height="fill_parent"
+    android:layout_width="fill_parent"
+    android:orientation="vertical"
+    android:weightSum="100"
+    android:background="#f0f0f0"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <FrameLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_weight="40"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp"
+        android:paddingTop="20dp"
+        android:paddingBottom="20dp">
+
+        <org.telegram.ui.Views.IdenticonView
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:id="@+id/identicon_view"/>
+
+    </FrameLayout>
+
+    <FrameLayout android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_weight="60"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:paddingBottom="10dp"
+        android:background="#ffffff">
+
+        <TextView android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:textColor="#7f7f7f"
+            android:textSize="16dp"
+            android:layout_gravity="center"
+            android:autoLink="web"
+            android:gravity="center"
+            android:textColorLink="#316f9f"
+            android:id="@+id/identicon_text"/>
+
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/intro_layout.xml b/TMessagesProj/src/main/res/layout-es/intro_layout.xml
new file mode 100644
index 000000000..7efe863b3
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/intro_layout.xml
@@ -0,0 +1,103 @@
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="fill_parent"
+    android:layout_width="fill_parent"
+    android:fillViewport="true">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#fafafa">
+
+        <FrameLayout
+            android:layout_gravity="top"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="88dp">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_gravity="center"
+                android:layout_height="wrap_content"
+                android:id="@+id/icon_image1"
+                android:src="@drawable/intro1"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_gravity="center"
+                android:layout_height="wrap_content"
+                android:id="@+id/icon_image2"/>
+
+        </FrameLayout>
+
+        <android.support.v4.view.ViewPager
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:id="@+id/intro_view_pager"/>
+
+        <TextView android:layout_width="192dp"
+            android:layout_height="44dp"
+            android:layout_marginTop="336dp"
+            android:background="@drawable/regbtn_states"
+            android:text="@string/StartMessaging"
+            android:layout_gravity="center_horizontal"
+            android:textSize="18dp"
+            android:textColor="#ffffff"
+            android:gravity="center"
+            android:id="@+id/start_messaging_button"
+            android:paddingBottom="2dp"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/bottom_pages"
+            android:orientation="horizontal"
+            android:layout_gravity="bottom|center_horizontal"
+            android:layout_marginBottom="26dp">
+
+            <FrameLayout
+                android:layout_width="5dp"
+                android:layout_height="5dp"
+                android:background="#bbbbbb"/>
+
+            <FrameLayout
+                android:layout_width="5dp"
+                android:layout_height="5dp"
+                android:background="#bbbbbb"
+                android:layout_marginLeft="7dp"/>
+
+            <FrameLayout
+                android:layout_width="5dp"
+                android:layout_height="5dp"
+                android:background="#bbbbbb"
+                android:layout_marginLeft="7dp"/>
+
+            <FrameLayout
+                android:layout_width="5dp"
+                android:layout_height="5dp"
+                android:background="#bbbbbb"
+                android:layout_marginLeft="7dp"/>
+
+            <FrameLayout
+                android:layout_width="5dp"
+                android:layout_height="5dp"
+                android:background="#bbbbbb"
+                android:layout_marginLeft="7dp"/>
+
+            <FrameLayout
+                android:layout_width="5dp"
+                android:layout_height="5dp"
+                android:background="#bbbbbb"
+                android:layout_marginLeft="7dp"/>
+
+            <FrameLayout
+                android:layout_width="5dp"
+                android:layout_height="5dp"
+                android:background="#bbbbbb"
+                android:layout_marginLeft="7dp"/>
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/intro_view_layout.xml b/TMessagesProj/src/main/res/layout-es/intro_view_layout.xml
new file mode 100644
index 000000000..08b700038
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/intro_view_layout.xml
@@ -0,0 +1,28 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <TextView android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:id="@+id/header_text"
+        android:textSize="26dp"
+        android:gravity="center"
+        android:layout_gravity="top|left"
+        android:layout_marginLeft="18dp"
+        android:layout_marginRight="16dp"
+        android:textColor="#ff000000"
+        android:layout_marginTop="224dp"/>
+
+    <TextView android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:id="@+id/message_text"
+        android:textSize="15dp"
+        android:gravity="center"
+        android:layout_gravity="top|left"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginTop="266dp"
+        android:textColor="#808080"/>
+
+</FrameLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/loading_more_layout.xml b/TMessagesProj/src/main/res/layout-es/loading_more_layout.xml
new file mode 100644
index 000000000..057f5a64b
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/loading_more_layout.xml
@@ -0,0 +1,11 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+    <ProgressBar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:padding="6dp"
+            android:id="@+id/progress">
+    </ProgressBar>
+</RelativeLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/location_attach_layout.xml b/TMessagesProj/src/main/res/layout-es/location_attach_layout.xml
new file mode 100644
index 000000000..14f7865b2
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/location_attach_layout.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:layout_gravity="top">
+
+    <FrameLayout android:id="@+id/map_view"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:layout_gravity="top"/>
+
+    <TextView android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_gravity="bottom"
+            android:layout_marginBottom="15dp"
+            android:layout_marginRight="15dp"
+            android:layout_marginLeft="15dp"
+            android:text="@string/SendLocation"
+            android:gravity="center"
+            android:textSize="18dp"
+            android:textColor="#316f9f"
+            android:background="@drawable/location_send_button_states"
+            android:id="@+id/location_send_button"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/location_view_layout.xml b/TMessagesProj/src/main/res/layout-es/location_view_layout.xml
new file mode 100644
index 000000000..d339fb854
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/location_view_layout.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:layout_gravity="top">
+
+    <FrameLayout android:id="@+id/map_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="top"/>
+
+    <FrameLayout android:layout_width="fill_parent"
+                 android:layout_height="91dp"
+                 android:layout_gravity="bottom"
+                 android:background="@drawable/location_panel"
+                 android:id="@+id/location_bottom_view">
+        <org.telegram.ui.Views.BackupImageView
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:contentDescription=""
+                android:id="@+id/location_avatar_view"
+                android:layout_marginLeft="12dp"
+                android:layout_marginTop="16dp"
+                android:layout_gravity="top"/>
+
+        <TextView android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="22dp"
+                android:textColor="#000000"
+                android:layout_marginLeft="88dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginRight="12dp"
+                android:id="@+id/location_name_label"
+                android:layout_gravity="top"
+                android:maxLines="1"/>
+
+        <TextView android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:textSize="15dp"
+                  android:layout_marginLeft="88dp"
+                  android:layout_marginTop="52dp"
+                  android:layout_marginRight="12dp"
+                  android:textColor="#999999"
+                  android:id="@+id/location_distance_label"
+                  android:layout_gravity="top"
+                  android:maxLines="1"/>
+    </FrameLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/login_layout.xml b/TMessagesProj/src/main/res/layout-es/login_layout.xml
new file mode 100644
index 000000000..ac04b19ae
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/login_layout.xml
@@ -0,0 +1,291 @@
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#fafafa"
+    android:fillViewport="true">
+
+    <org.telegram.ui.Views.FrameLayoutFixed
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|left">
+
+        <org.telegram.ui.LoginActivityPhoneView
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="30dp"
+            android:layout_gravity="top|left"
+            android:id="@+id/login_page1">
+
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="50dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:id="@+id/login_coutry_textview"
+                android:textSize="20dp"
+                android:paddingTop="10dp"
+                android:gravity="left|center_horizontal"
+                android:textIsSelectable="false"
+                android:textColor="#000000"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:maxLines="1"
+                android:background="@drawable/spinner_states"/>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="1px"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:background="#808080"
+                android:layout_marginTop="-6.5dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginRight="24dp"/>
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:layout_gravity="top|left"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="+"
+                    android:textColor="#a6a6a6"
+                    android:textSize="20dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_gravity="top|left"/>
+
+                <EditText
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/login_county_code_field"
+                    android:width="70dp"
+                    android:editable="true"
+                    android:inputType="phone"
+                    android:maxLength="4"
+                    android:maxLines="1"
+                    android:textSize="18dp"
+                    android:gravity="center"
+                    android:imeOptions="actionNext|flagNoExtractUi"
+                    android:textCursorDrawable="@null"
+                    android:textColor="#000000"
+                    android:layout_gravity="top|left"/>
+
+                <EditText
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/login_phone_field"
+                    android:inputType="phone"
+                    android:maxLines="1"
+                    android:textSize="18dp"
+                    android:layout_marginRight="20dp"
+                    android:imeOptions="actionNext|flagNoExtractUi"
+                    android:textCursorDrawable="@null"
+                    android:textColor="#000000"
+                    android:textColorHint="#979797"
+                    android:gravity="center_vertical"
+                    android:layout_gravity="top|left"/>
+
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/StartText"
+                android:id="@+id/login_confirm_text"
+                android:layout_marginTop="28dp"
+                android:textColor="#808080"
+                android:layout_gravity="center_horizontal"
+                android:textSize="16dp"
+                android:gravity="center"
+                android:layout_marginBottom="10dp"
+                android:lineSpacingExtra="2dp"/>
+
+        </org.telegram.ui.LoginActivityPhoneView>
+
+        <org.telegram.ui.LoginActivitySmsView
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginTop="30dp"
+            android:visibility="gone"
+            android:id="@+id/login_page2"
+            android:layout_gravity="top|left"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/login_sms_confirm_text"
+                android:textColor="#808080"
+                android:textSize="16dp"
+                android:gravity="center_horizontal"
+                android:layout_gravity="center_horizontal"
+                android:lineSpacingExtra="2dp"/>
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:inputType="numberDecimal"
+                android:width="220dp"
+                android:id="@+id/login_sms_code_field"
+                android:layout_marginTop="20dp"
+                android:gravity="center_horizontal"
+                android:maxLines="1"
+                android:editable="true"
+                android:textSize="18dp"
+                android:imeOptions="actionNext|flagNoExtractUi"
+                android:hint="@string/Code"
+                android:textCursorDrawable="@null"
+                android:layout_gravity="center_horizontal"
+                android:textColor="#000000"
+                android:textColorHint="#979797"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/login_time_text"
+                android:layout_marginTop="20dp"
+                android:gravity="center_horizontal"
+                android:layout_gravity="center_horizontal"
+                android:textSize="16dp"
+                android:textColor="#808080"
+                android:lineSpacingExtra="2dp"/>
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_below="@+id/spinner"
+                android:gravity="center_horizontal|bottom"
+                android:layout_gravity="top|left">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/wrong_number"
+                    android:gravity="center"
+                    android:textSize="16dp"
+                    android:textColor="#316f9f"
+                    android:lineSpacingExtra="2dp"
+                    android:text="@string/WrongNumber"
+                    android:layout_gravity="bottom|center_horizontal"
+                    android:paddingTop="24dp"
+                    android:layout_marginBottom="10dp"/>
+
+            </LinearLayout>
+
+        </org.telegram.ui.LoginActivitySmsView>
+
+        <org.telegram.ui.LoginActivityRegisterView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="30dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:orientation="vertical"
+            android:id="@+id/login_page3"
+            android:visibility="gone"
+            android:layout_gravity="top|left">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/RegisterText"
+                android:id="@+id/login_register_info"
+                android:layout_marginTop="8dp"
+                android:textColor="#808080"
+                android:gravity="center_horizontal"
+                android:layout_gravity="center_horizontal"
+                android:textSize="16dp"/>
+
+            <EditText
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/login_first_name_field"
+                android:maxLines="1"
+                android:textSize="18dp"
+                android:imeOptions="actionNext|flagNoExtractUi"
+                android:layout_marginLeft="40dp"
+                android:layout_marginRight="40dp"
+                android:layout_marginTop="34dp"
+                android:hint="@string/FirstName"
+                android:lines="1"
+                android:capitalize="words"
+                android:textCursorDrawable="@null"
+                android:textColor="#000000"
+                android:textColorHint="#979797"/>
+
+            <EditText
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/login_last_name_field"
+                android:textSize="18dp"
+                android:imeOptions="actionNext|flagNoExtractUi"
+                android:layout_marginLeft="40dp"
+                android:layout_marginRight="40dp"
+                android:hint="@string/LastName"
+                android:lines="1"
+                android:maxLines="1"
+                android:capitalize="words"
+                android:autoText="false"
+                android:textCursorDrawable="@null"
+                android:textColor="#000000"
+                android:textColorHint="#979797"
+                android:layout_marginTop="10dp"/>
+
+            <!--<FrameLayout-->
+                <!--android:layout_width="108dp"-->
+                <!--android:layout_height="108dp"-->
+                <!--android:layout_marginTop="20dp"-->
+                <!--android:layout_below="@+id/login_register_info"-->
+                <!--android:id="@+id/login_avatar_button">-->
+
+                <!--<org.telegram.ui.Views.BackupImageView-->
+                    <!--android:id="@+id/settings_avatar_image"-->
+                    <!--android:layout_width="fill_parent"-->
+                    <!--android:layout_height="fill_parent"-->
+                    <!--android:src="@drawable/user_placeholder"/>-->
+
+                <!--<ImageButton-->
+                    <!--android:id="@+id/settings_change_avatar_button"-->
+                    <!--android:background="@drawable/photo_spinner"-->
+                    <!--android:layout_width="fill_parent"-->
+                    <!--android:layout_height="fill_parent"/>-->
+            <!--</FrameLayout>-->
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_below="@+id/spinner"
+                android:gravity="center_horizontal|bottom"
+                android:minHeight="140dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="30dp"
+                    android:id="@+id/changed_mind"
+                    android:gravity="center"
+                    android:textSize="16dp"
+                    android:textColor="#316f9f"
+                    android:lineSpacingExtra="2dp"
+                    android:text="@string/CancelRegistration"
+                    android:layout_gravity="bottom|center_horizontal"
+                    android:layout_marginTop="-40dp"
+                    android:layout_marginBottom="20dp"/>
+
+            </LinearLayout>
+
+        </org.telegram.ui.LoginActivityRegisterView>
+
+    </org.telegram.ui.Views.FrameLayoutFixed>
+
+</ScrollView>
diff --git a/TMessagesProj/src/main/res/layout-es/media_layout.xml b/TMessagesProj/src/main/res/layout-es/media_layout.xml
new file mode 100644
index 000000000..1b76a01e6
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/media_layout.xml
@@ -0,0 +1,44 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="top">
+
+    <GridView android:id="@+id/media_grid"
+        android:paddingLeft="2dp"
+        android:paddingRight="2dp"
+        android:paddingBottom="2dp"
+        android:clipToPadding="false"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:drawSelectorOnTop="true"
+        android:verticalSpacing="4dp"
+        android:horizontalSpacing="4dp"
+        android:numColumns="auto_fit"
+        android:stretchMode="columnWidth"
+        android:gravity="center"
+        android:layout_gravity="top"/>
+
+    <TextView android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:textColor="#808080"
+        android:gravity="center"
+        android:text="@string/NoMedia"
+        android:textSize="24dp"
+        android:id="@+id/searchEmptyView"
+        android:visibility="gone"/>
+
+    <LinearLayout
+        android:id="@+id/progressLayout"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone" >
+
+        <ProgressBar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" >
+        </ProgressBar>
+    </LinearLayout>
+
+</FrameLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/media_loading_layout.xml b/TMessagesProj/src/main/res/layout-es/media_loading_layout.xml
new file mode 100644
index 000000000..85a059b04
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/media_loading_layout.xml
@@ -0,0 +1,11 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="100dp"
+    android:layout_height="100dp">
+    <ProgressBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:paddingTop="6dp"
+        android:paddingBottom="6dp">
+    </ProgressBar>
+</FrameLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/media_photo_layout.xml b/TMessagesProj/src/main/res/layout-es/media_photo_layout.xml
new file mode 100644
index 000000000..b60a04d28
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/media_photo_layout.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="100dp"
+             android:layout_height="100dp">
+    <org.telegram.ui.Views.BackupImageView
+        android:id="@+id/media_photo_image"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:scaleType="centerCrop"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/media_video_layout.xml b/TMessagesProj/src/main/res/layout-es/media_video_layout.xml
new file mode 100644
index 000000000..6bcdc3293
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/media_video_layout.xml
@@ -0,0 +1,40 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="100dp"
+    android:layout_height="100dp">
+
+    <org.telegram.ui.Views.BackupImageView
+        android:id="@+id/media_photo_image"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:scaleType="centerCrop"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="16dp"
+        android:paddingLeft="3dp"
+        android:paddingRight="3dp"
+        android:background="@drawable/phototime"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_gravity="bottom">
+
+        <ImageView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:src="@drawable/ic_video"/>
+
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:textColor="#ffffff"
+            android:textSize="12dp"
+            android:layout_marginLeft="4dp"
+            android:gravity="center_vertical"
+            android:layout_gravity="center_vertical"
+            android:layout_marginBottom="1dp"
+            android:id="@+id/chat_video_time"/>
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/messages_list.xml b/TMessagesProj/src/main/res/layout-es/messages_list.xml
new file mode 100644
index 000000000..dabee8f19
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/messages_list.xml
@@ -0,0 +1,69 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+    <ListView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/messages_list_view"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:clipToPadding="false"
+        android:fadingEdge="none"
+        android:fadingEdgeLength="0dp"
+        android:divider="@null"
+        android:dividerHeight="0dp"
+        android:animationCache="false"/>
+
+    <TextView android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:textColor="#808080"
+        android:gravity="center"
+        android:text="@string/NoResult"
+        android:textSize="24dp"
+        android:id="@+id/searchEmptyView"
+        android:visibility="invisible"/>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/list_empty_view"
+        android:layout_centerInParent="true"
+        android:orientation="vertical"
+        android:gravity="center"
+        android:visibility="gone">
+
+        <TextView android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:textColor="#959595"
+            android:text="@string/NoChats"
+            android:textSize="24dp"
+            android:id="@+id/list_empty_view_text1"/>
+
+        <TextView android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:textColor="#959595"
+            android:text="@string/NoChatsHelp"
+            android:gravity="center"
+            android:textSize="15dp"
+            android:paddingTop="6dp"
+            android:lineSpacingExtra="2dp"
+            android:id="@+id/list_empty_view_text2"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/progressLayout"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone" >
+
+        <ProgressBar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+        </ProgressBar>
+    </LinearLayout>
+</RelativeLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/messages_list_row.xml b/TMessagesProj/src/main/res/layout-es/messages_list_row.xml
new file mode 100644
index 000000000..e9794be94
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/messages_list_row.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="70dp"
+    android:paddingTop="8dp"
+    android:paddingLeft="11dp"
+    android:paddingRight="11dp"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.BackupImageView
+        android:layout_width="54dp"
+        android:layout_height="54dp"
+        android:id="@+id/messages_list_row_avatar"
+        android:contentDescription=""/>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/messages_list_row_name_layout"
+        android:orientation="horizontal"
+        android:layout_marginLeft="66dp"
+        android:layout_gravity="top">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:id="@+id/messages_list_row_name"
+            android:textSize="19dp"
+            android:layout_marginRight="3dp"
+            android:ellipsize="end"
+            android:layout_weight="1"
+            android:singleLine="false"
+            android:scrollHorizontally="true"
+            android:gravity="left"
+            android:textColor="#222222"
+            android:maxLines="1"/>
+
+        <FrameLayout
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginRight="2dp"
+            android:layout_gravity="top">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/msg_clock"
+                android:id="@+id/messages_list_row_clock"
+                android:visibility="gone"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/dialogs_check"
+                android:id="@+id/messages_list_row_check"
+                android:visibility="gone"/>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/dialogs_halfcheck"
+                android:paddingLeft="5dp"
+                android:id="@+id/messages_list_row_check_half"
+                android:visibility="gone"/>
+
+        </FrameLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/messages_list_row_time"
+            android:textSize="14dp"
+            android:layout_marginTop="-2dp"
+            android:textColor="#9e9e9e"
+            android:lines="1"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="24dp"
+        android:orientation="horizontal"
+        android:layout_marginTop="28dp"
+        android:layout_marginLeft="66dp"
+        android:layout_gravity="top">
+
+        <FrameLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/messages_list_row_message"
+                android:textSize="16dp"
+                android:lines="1"
+                android:ellipsize="end"
+                android:textColor="#808080"
+                android:gravity="left"
+                android:layout_marginTop="2dp"/>
+
+        </FrameLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/messages_list_row_badge"
+            android:textSize="13dp"
+            android:gravity="center"
+            android:lines="1"
+            android:layout_gravity="center"
+            android:textColor="#ffffff"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:background="@drawable/dialogs_badge"
+            android:visibility="visible"
+            android:layout_marginLeft="8dp"/>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/dialogs_warning"
+        android:layout_marginLeft="8dp"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:id="@+id/messages_list_row_error"/>
+
+    </LinearLayout>
+
+    <View android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/messages_search_chat_layout.xml b/TMessagesProj/src/main/res/layout-es/messages_search_chat_layout.xml
new file mode 100644
index 000000000..b750c11fd
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/messages_search_chat_layout.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="64dp"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.BackupImageView
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:id="@+id/messages_list_row_avatar"
+        android:contentDescription=""
+        android:layout_marginTop="7dp"
+        android:layout_gravity="top"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/messages_list_row_name"
+        android:textSize="18dp"
+        android:layout_marginLeft="61dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="#333333"
+        android:layout_gravity="center_vertical"/>
+
+    <View
+        android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/messages_search_user_layout.xml b/TMessagesProj/src/main/res/layout-es/messages_search_user_layout.xml
new file mode 100644
index 000000000..046fc8287
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/messages_search_user_layout.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="64dp"
+    android:layout_gravity="top">
+
+    <org.telegram.ui.Views.BackupImageView
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:id="@+id/messages_list_row_avatar"
+        android:contentDescription=""
+        android:layout_marginTop="7dp"
+        android:layout_gravity="top"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/messages_list_row_name"
+        android:textSize="18dp"
+        android:layout_marginLeft="61dp"
+        android:ellipsize="end"
+        android:textColor="#333333"
+        android:layout_marginTop="10dp"
+        android:maxLines="1"
+        android:layout_gravity="top"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/messages_list_row_message"
+        android:textSize="15dp"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:textColor="#999999"
+        android:layout_marginLeft="61dp"
+        android:layout_marginTop="34dp"
+        android:layout_gravity="top"/>
+
+    <View
+        android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"
+        android:visibility="gone"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/notification_layout.xml b/TMessagesProj/src/main/res/layout-es/notification_layout.xml
new file mode 100644
index 000000000..e557bca37
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/notification_layout.xml
@@ -0,0 +1,62 @@
+<org.telegram.ui.Views.NotificationView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:id="@+id/container_view"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="#ffffff">
+
+        <org.telegram.ui.Views.BackupImageView
+            android:layout_height="48dp"
+            android:layout_width="48dp"
+            android:id="@+id/avatar_image"/>
+
+        <FrameLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginLeft="56dp"
+            android:orientation="vertical"
+            android:layout_marginRight="40dp"
+            android:layout_gravity="top|left"
+            android:id="@+id/text_layout">
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:gravity="left|center"
+                android:textSize="15dp"
+                android:textColor="#000000"
+                android:id="@+id/name_text_view"
+                android:paddingTop="4dp"
+                android:ellipsize="end"
+                android:singleLine="true"/>
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:gravity="left|center"
+                android:textColor="#000000"
+                android:textSize="15dp"
+                android:id="@+id/message_text_view"
+                android:paddingTop="24dp"
+                android:ellipsize="end"
+                android:singleLine="true"/>
+
+        </FrameLayout>
+
+        <ImageView
+            android:layout_height="40dp"
+            android:layout_width="40dp"
+            android:layout_gravity="right|center"
+            android:src="@drawable/ic_profile_cross"
+            android:scaleType="center"
+            android:id="@+id/close_button"/>
+
+    </FrameLayout>
+
+</org.telegram.ui.Views.NotificationView>
diff --git a/TMessagesProj/src/main/res/layout-es/settings_blocked_users_layout.xml b/TMessagesProj/src/main/res/layout-es/settings_blocked_users_layout.xml
new file mode 100644
index 000000000..3507f9e1b
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/settings_blocked_users_layout.xml
@@ -0,0 +1,45 @@
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/listView"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:clipToPadding="false"
+        android:fadingEdge="none"
+        android:fadingEdgeLength="0dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:dividerHeight="0dp"
+        android:divider="@null"
+        android:scrollbars="none"
+        android:paddingBottom="16dp"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:textColor="#808080"
+        android:gravity="center"
+        android:text="@string/NoBlocked"
+        android:textSize="24dp"
+        android:id="@+id/searchEmptyView"/>
+
+    <LinearLayout
+        android:id="@+id/progressLayout"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ProgressBar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/settings_change_name_layout.xml b/TMessagesProj/src/main/res/layout-es/settings_change_name_layout.xml
new file mode 100644
index 000000000..f3e0dd306
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/settings_change_name_layout.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#ffffff">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingTop="8dp">
+
+        <include layout="@layout/settings_section_layout"/>
+
+        <EditText
+            android:textSize="19dp"
+            android:textColorHint="#a3a3a3"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/first_name_field"
+            android:paddingBottom="15dp"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:hint="@string/FirstName"
+            android:lines="1"
+            android:singleLine="true"
+            android:inputType="textCapSentences|textAutoCorrect"
+            android:imeOptions="actionNext"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp"
+            android:textCursorDrawable="@null"
+            android:textColor="#000000"/>
+
+        <EditText
+            android:textSize="19dp"
+            android:textColorHint="#a3a3a3"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/last_name_field"
+            android:paddingBottom="15dp"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:hint="@string/LastName"
+            android:lines="1"
+            android:singleLine="true"
+            android:inputType="textCapSentences|textAutoCorrect"
+            android:imeOptions="actionDone"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp"
+            android:textCursorDrawable="@null"
+            android:textColor="#000000"/>
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/settings_do_action_layout.xml b/TMessagesProj/src/main/res/layout-es/settings_do_action_layout.xml
new file mode 100644
index 000000000..0b85dd90a
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/settings_do_action_layout.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <Button
+        android:textSize="12dp"
+        android:textColor="#ffffff"
+        android:id="@+id/cancel_button"
+        android:background="@drawable/bar_selector"
+        android:paddingLeft="3dp"
+        android:layout_width="0.0dip"
+        android:layout_height="fill_parent"
+        android:text="@string/Cancel"
+        android:textAllCaps="true"
+        android:layout_weight="1.0"
+        android:textStyle="bold"/>
+
+    <View
+        android:layout_gravity="center_vertical"
+        android:background="#c9c9c9"
+        android:layout_width="1px"
+        android:layout_height="28dp" />
+
+    <FrameLayout
+        android:id="@+id/done_button"
+        android:background="@drawable/bar_selector"
+        android:paddingRight="3dp"
+        android:clickable="true"
+        android:layout_width="0.0dip"
+        android:layout_height="fill_parent"
+        android:layout_weight="1.0">
+
+        <TextView
+            android:textSize="12dp"
+            android:textColor="#ffffff"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAllCaps="true"
+            android:id="@+id/done_button_text"
+            android:text="@string/Done"
+            android:drawableLeft="@drawable/ic_done"
+            android:drawablePadding="8dp"
+            android:textStyle="bold"/>
+
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/settings_layout.xml b/TMessagesProj/src/main/res/layout-es/settings_layout.xml
new file mode 100644
index 000000000..6cfa958ec
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/settings_layout.xml
@@ -0,0 +1,23 @@
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/listView"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:clipToPadding="false"
+        android:fadingEdge="none"
+        android:fadingEdgeLength="0dp"
+        android:paddingLeft="13dp"
+        android:paddingRight="13dp"
+        android:dividerHeight="0dp"
+        android:divider="@null"
+        android:scrollbars="none"
+        android:paddingBottom="16dp"/>
+
+</RelativeLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/settings_logout_button.xml b/TMessagesProj/src/main/res/layout-es/settings_logout_button.xml
new file mode 100644
index 000000000..59bda7dc0
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/settings_logout_button.xml
@@ -0,0 +1,17 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="56dp"
+    android:paddingTop="8dp">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/logout_button_states"
+        android:text="@string/LogOut"
+        android:gravity="center"
+        android:textSize="17dp"
+        android:textColor="#000000"
+        android:id="@+id/settings_row_text"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/settings_name_layout.xml b/TMessagesProj/src/main/res/layout-es/settings_name_layout.xml
new file mode 100644
index 000000000..332f30156
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/settings_name_layout.xml
@@ -0,0 +1,73 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="13dp"
+    android:paddingBottom="12dp">
+
+    <FrameLayout
+        android:layout_width="64dp"
+        android:layout_height="64dp">
+
+        <org.telegram.ui.Views.BackupImageView
+            android:id="@+id/settings_avatar_image"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"/>
+
+        <ImageButton
+            android:id="@+id/settings_change_avatar_button"
+            android:background="@drawable/photo_spinner"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"/>
+
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="13dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginBottom="1dp"
+        android:layout_weight="1.0">
+
+        <TextView
+            android:textSize="21dp"
+            android:textColor="#333333"
+            android:ellipsize="end"
+            android:id="@+id/settings_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:lines="1"
+            android:singleLine="true" />
+
+        <TextView
+            android:textSize="14dp"
+            android:textColor="#999999"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:text="@string/Online"
+            android:id="@+id/settings_online"/>
+
+    </LinearLayout>
+
+    <View
+        android:background="#e8e8e8"
+        android:layout_width="1dp"
+        android:layout_height="48dp"
+        android:layout_marginTop="4dp"/>
+
+    <ImageButton
+        android:id="@+id/settings_edit_name"
+        android:background="@drawable/list_selector"
+        android:clickable="true"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:src="@drawable/ic_edit"
+        android:layout_marginTop="4dp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/settings_row_button_layout.xml b/TMessagesProj/src/main/res/layout-es/settings_row_button_layout.xml
new file mode 100644
index 000000000..20a9ee2ee
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/settings_row_button_layout.xml
@@ -0,0 +1,25 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="50dp"
+    android:layout_gravity="top">
+
+    <TextView
+        android:textSize="18dp"
+        android:textColor="#333333"
+        android:id="@+id/settings_row_text"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:gravity="center_vertical"
+        android:layout_gravity="top"/>
+
+    <View
+        android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/settings_row_check_layout.xml b/TMessagesProj/src/main/res/layout-es/settings_row_check_layout.xml
new file mode 100644
index 000000000..f14a48913
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/settings_row_check_layout.xml
@@ -0,0 +1,34 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="50dp"
+    android:layout_gravity="top">
+
+    <TextView
+        android:textSize="18dp"
+        android:textColor="#333333"
+        android:id="@+id/settings_row_text"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:gravity="center_vertical"
+        android:layout_gravity="top"/>
+
+    <ImageView
+        android:layout_gravity="center_vertical|right"
+        android:id="@+id/settings_row_check_button"
+        android:duplicateParentState="false"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="8dp"
+        android:src="@drawable/btn_check_on"/>
+
+    <View
+        android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/settings_row_check_notify_layout.xml b/TMessagesProj/src/main/res/layout-es/settings_row_check_notify_layout.xml
new file mode 100644
index 000000000..96bfcd77b
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/settings_row_check_notify_layout.xml
@@ -0,0 +1,33 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="64dp"
+    android:layout_gravity="top">
+
+    <TextView
+        android:textSize="18dp"
+        android:textColor="#333333"
+        android:id="@+id/settings_row_text"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:gravity="center_vertical"
+        android:layout_gravity="top"/>
+
+    <ImageView
+        android:layout_gravity="center_vertical|right"
+        android:id="@+id/settings_row_check_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="14dp"
+        android:src="@drawable/btn_check_on" />
+
+    <View
+        android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/settings_row_detail_layout.xml b/TMessagesProj/src/main/res/layout-es/settings_row_detail_layout.xml
new file mode 100644
index 000000000..469d9ba6c
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/settings_row_detail_layout.xml
@@ -0,0 +1,39 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_gravity="top">
+
+    <TextView
+        android:textSize="18dp"
+        android:textColor="#333333"
+        android:id="@+id/settings_row_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:gravity="center_vertical"
+        android:layout_marginTop="10dp"
+        android:layout_gravity="top"/>
+
+    <TextView
+        android:textSize="14dp"
+        android:textColor="#999999"
+        android:id="@+id/settings_row_text_detail"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:gravity="center_vertical"
+        android:layout_marginBottom="12dp"
+        android:layout_gravity="bottom"/>
+
+    <View
+        android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/settings_section_layout.xml b/TMessagesProj/src/main/res/layout-es/settings_section_layout.xml
new file mode 100644
index 000000000..a9b6d8512
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/settings_section_layout.xml
@@ -0,0 +1,27 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:id="@+id/settings_section_view"
+    android:layout_gravity="top">
+
+    <TextView
+        android:textSize="14dp"
+        android:textStyle="bold"
+        android:textColor="#3b84c0"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="6dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginBottom="4dp"
+        android:id="@+id/settings_section_text"
+        android:layout_gravity="top"/>
+
+    <View
+        android:background="#6caae4"
+        android:layout_width="fill_parent"
+        android:layout_height="1dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/settings_unblock_info_row_layout.xml b/TMessagesProj/src/main/res/layout-es/settings_unblock_info_row_layout.xml
new file mode 100644
index 000000000..b1eeddc3f
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/settings_unblock_info_row_layout.xml
@@ -0,0 +1,15 @@
+<FrameLayout
+    android:layout_width="fill_parent"
+    android:layout_height="48dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:textColor="#9a9a9a"
+        android:text="@string/UnblockText"
+        android:textSize="15dp"
+        android:id="@+id/info_text_view"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/settings_wallpapers_layout.xml b/TMessagesProj/src/main/res/layout-es/settings_wallpapers_layout.xml
new file mode 100644
index 000000000..7c135a5bd
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/settings_wallpapers_layout.xml
@@ -0,0 +1,84 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <ImageView
+        android:layout_height="fill_parent"
+        android:layout_width="fill_parent"
+        android:scaleType="centerCrop"
+        android:id="@+id/background_image"
+        android:layout_marginBottom="48dp"/>
+
+    <ProgressBar
+        android:background="#99000000"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_gravity="center"
+        android:id="@+id/action_progress"
+        android:padding="6dp"
+        android:visibility="visible"
+        android:layout_marginBottom="52dp"/>
+
+    <org.telegram.ui.Views.HorizontalListView
+        android:layout_width="fill_parent"
+        android:layout_height="102dp"
+        android:layout_gravity="bottom"
+        android:id="@+id/listView"
+        android:clipToPadding="false"
+        android:paddingLeft="40dp"
+        android:paddingRight="40dp"
+        android:layout_marginBottom="48dp"/>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="48dp"
+        android:layout_gravity="bottom">
+
+        <Button
+            android:textSize="12dp"
+            android:textColor="#111111"
+            android:id="@+id/cancel_button"
+            android:background="@drawable/list_selector"
+            android:paddingLeft="3dp"
+            android:layout_width="0.0dip"
+            android:layout_height="fill_parent"
+            android:text="@string/Cancel"
+            android:textAllCaps="true"
+            android:layout_weight="1.0"
+            android:textStyle="bold"/>
+
+        <View
+            android:layout_gravity="center_vertical"
+            android:background="#c9c9c9"
+            android:layout_width="1px"
+            android:layout_height="28dp" />
+
+        <FrameLayout
+            android:id="@+id/done_button"
+            android:background="@drawable/list_selector"
+            android:paddingRight="3dp"
+            android:clickable="true"
+            android:layout_width="0.0dip"
+            android:layout_height="fill_parent"
+            android:layout_weight="1.0">
+
+            <TextView
+                android:textSize="12dp"
+                android:textColor="#111111"
+                android:gravity="center"
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAllCaps="true"
+                android:id="@+id/done_button_text"
+                android:text="@string/Set"
+                android:drawableLeft="@drawable/ic_ab_done_gray"
+                android:drawablePadding="8dp"
+                android:textStyle="bold"/>
+        </FrameLayout>
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/settings_wallpapers_my_row.xml b/TMessagesProj/src/main/res/layout-es/settings_wallpapers_my_row.xml
new file mode 100644
index 000000000..d0683c0b1
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/settings_wallpapers_my_row.xml
@@ -0,0 +1,20 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="102dp"
+    android:layout_width="100dp"
+    android:id="@+id/parent">
+
+    <ImageView
+        android:layout_height="100dp"
+        android:layout_width="100dp"
+        android:scaleType="center"
+        android:id="@+id/image"
+        android:layout_gravity="bottom"/>
+
+    <FrameLayout
+        android:layout_height="102dp"
+        android:layout_width="100dp"
+        android:background="@drawable/wall_selection"
+        android:id="@+id/selection"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/settings_wallpapers_other_row.xml b/TMessagesProj/src/main/res/layout-es/settings_wallpapers_other_row.xml
new file mode 100644
index 000000000..f7873c527
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/settings_wallpapers_other_row.xml
@@ -0,0 +1,20 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="102dp"
+    android:layout_width="100dp">
+
+    <org.telegram.ui.Views.BackupImageView
+        android:layout_height="100dp"
+        android:layout_width="100dp"
+        android:scaleType="centerCrop"
+        android:id="@+id/image"
+        android:layout_gravity="bottom"
+        android:background="#5A475866"/>
+
+    <FrameLayout
+        android:layout_height="102dp"
+        android:layout_width="100dp"
+        android:background="@drawable/wall_selection"
+        android:id="@+id/selection"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/updating_state_layout.xml b/TMessagesProj/src/main/res/layout-es/updating_state_layout.xml
new file mode 100644
index 000000000..715e3ab2b
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/updating_state_layout.xml
@@ -0,0 +1,39 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="400dp"
+    android:layout_height="fill_parent"
+    android:background="@drawable/bar_selector"
+    android:id="@+id/back_button_background">
+
+    <ProgressBar
+        android:layout_height="32dp"
+        android:layout_width="32dp"
+        android:indeterminate="true"
+        android:indeterminateDrawable="@drawable/loading_header_animation"
+        android:indeterminateBehavior="repeat"
+        android:indeterminateDuration="1200"
+        android:indeterminateOnly="true"
+        android:layout_gravity="center_vertical|left"
+        android:visibility="visible"
+        android:layout_marginLeft="12dp"/>
+
+    <ImageView android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/ic_ab_back"
+        android:layout_gravity="center_vertical|left"
+        android:layout_marginLeft="3dp"
+        android:id="@+id/back_button"/>
+
+    <TextView android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginLeft="52dp"
+        android:textColor="#ffffff"
+        android:textSize="17dp"
+        android:layout_gravity="center_vertical|left"
+        android:gravity="left"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:paddingRight="2dp"
+        android:id="@+id/status_text"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/user_profile_avatar_layout.xml b/TMessagesProj/src/main/res/layout-es/user_profile_avatar_layout.xml
new file mode 100644
index 000000000..5f8796188
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/user_profile_avatar_layout.xml
@@ -0,0 +1,43 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="13dp"
+    android:paddingBottom="12dp">
+
+    <org.telegram.ui.Views.BackupImageView
+        android:id="@+id/settings_avatar_image"
+        android:layout_width="64dp"
+        android:layout_height="64dp"/>
+
+    <LinearLayout
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="13dp"
+        android:layout_marginBottom="1dp">
+
+        <TextView
+            android:textSize="21dp"
+            android:textColor="#333333"
+            android:ellipsize="end"
+            android:id="@+id/settings_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:lines="1"
+            android:singleLine="true"/>
+
+        <TextView
+            android:textSize="14dp"
+            android:textColor="#999999"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:id="@+id/settings_online"/>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/user_profile_identicon_layout.xml b/TMessagesProj/src/main/res/layout-es/user_profile_identicon_layout.xml
new file mode 100644
index 000000000..ae0129fed
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/user_profile_identicon_layout.xml
@@ -0,0 +1,33 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="50dp"
+    android:layout_gravity="top">
+
+    <TextView
+        android:textSize="18dp"
+        android:textColor="#333333"
+        android:id="@+id/settings_row_text"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:gravity="center_vertical"
+        android:layout_gravity="top"/>
+
+    <org.telegram.ui.Views.IdenticonView
+        android:id="@+id/identicon_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_gravity="right|center_vertical"/>
+
+    <View
+        android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/user_profile_layout.xml b/TMessagesProj/src/main/res/layout-es/user_profile_layout.xml
new file mode 100644
index 000000000..1a7d4354d
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/user_profile_layout.xml
@@ -0,0 +1,43 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="top"
+    android:background="#fafafa"
+    android:orientation="vertical">
+
+    <ListView
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:id="@+id/listView"
+        android:clipToPadding="false"
+        android:fadingEdge="none"
+        android:fadingEdgeLength="0dp"
+        android:paddingLeft="13dp"
+        android:paddingRight="13dp"
+        android:dividerHeight="0dp"
+        android:divider="@null"
+        android:scrollbars="none"
+        android:paddingBottom="16dp"
+        android:layout_gravity="top"
+        android:layout_weight="1"/>
+
+    <FrameLayout
+        android:layout_height="48dp"
+        android:layout_width="fill_parent"
+        android:background="@drawable/gray_button"
+        android:id="@+id/start_secret_button">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/StartEncryptedChat"
+            android:textSize="18dp"
+            android:textColor="#444444"
+            android:layout_gravity="center"
+            android:drawableLeft="@drawable/bigtimer"
+            android:gravity="center"/>
+
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/TMessagesProj/src/main/res/layout-es/user_profile_leftright_row_layout.xml b/TMessagesProj/src/main/res/layout-es/user_profile_leftright_row_layout.xml
new file mode 100644
index 000000000..9ac16a579
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/user_profile_leftright_row_layout.xml
@@ -0,0 +1,36 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="50dp"
+    android:layout_gravity="top">
+
+    <TextView
+        android:textSize="18dp"
+        android:textColor="#333333"
+        android:id="@+id/settings_row_text"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:gravity="center_vertical"
+        android:layout_gravity="top"/>
+
+    <TextView
+        android:textSize="18dp"
+        android:textColor="#316f9f"
+        android:id="@+id/settings_row_text_detail"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:gravity="center_vertical"
+        android:layout_gravity="right"/>
+
+    <View
+        android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/TMessagesProj/src/main/res/layout-es/user_profile_phone_layout.xml b/TMessagesProj/src/main/res/layout-es/user_profile_phone_layout.xml
new file mode 100644
index 000000000..ff654495d
--- /dev/null
+++ b/TMessagesProj/src/main/res/layout-es/user_profile_phone_layout.xml
@@ -0,0 +1,57 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="64dp"
+    android:background="@drawable/list_selector"
+    android:layout_gravity="top">
+
+    <TextView
+        android:textSize="18dp"
+        android:textColor="#333333"
+        android:id="@+id/settings_row_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:gravity="center_vertical"
+        android:layout_marginTop="9dp"
+        android:layout_gravity="top"/>
+
+    <TextView
+        android:textSize="13dp"
+        android:textColor="#999999"
+        android:id="@+id/settings_row_text_detail"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:gravity="center_vertical"
+        android:layout_marginBottom="9dp"
+        android:textAllCaps="true"
+        android:layout_gravity="bottom"/>
+
+    <View
+        android:background="#e8e8e8"
+        android:layout_width="1dp"
+        android:layout_height="48dp"
+        android:layout_gravity="right|center_vertical"
+        android:layout_marginRight="48dp"/>
+
+    <ImageButton
+        android:id="@+id/settings_edit_name"
+        android:background="@drawable/list_selector"
+        android:clickable="true"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:src="@drawable/ic_profile_send_message"
+        android:layout_gravity="right|center_vertical"
+        android:paddingTop="2dp"/>
+
+    <View
+        android:background="@color/divider"
+        android:layout_width="fill_parent"
+        android:layout_height="1px"
+        android:layout_gravity="bottom"
+        android:id="@+id/settings_row_divider"/>
+
+</FrameLayout>
\ No newline at end of file