diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
index f67809d79..f0b6ed488 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
@@ -365,10 +365,12 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
         listView.setOnItemClickListener(new RecyclerListView.OnItemClickListener() {
             @Override
             public void onItemClick(View view, final int position) {
-                if (getParentActivity() == null) {
+                if (getParentActivity() == null)
+                {
                     return;
                 }
-                if (position == settingsNotificationsRow) {
+                if (position == settingsNotificationsRow)
+                {
                     Bundle args = new Bundle();
                     if (chat_id != 0) {
                         args.putInt("chat_id", chat_id);
@@ -377,7 +379,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                     }
                     presentFragment(new ProfileNotificationsActivity(args));
                 }
-                else if(position==changeNameRow) {
+                else if(position==changeNameRow)
+                {
                     Bundle args = new Bundle();
                     args.putInt("do_what", ContactAddActivity.EDIT_NAME);
                     if (chat_id != 0) {
@@ -387,7 +390,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                     }
                     presentFragment(new ContactAddActivity(args));
                 }
-                else if(position==startChatRow) {
+                else if(position==startChatRow)
+                {
                     int belonging_chat_id = MrMailbox.getChatIdByContactId(user_id);
                     if( belonging_chat_id != 0 ) {
                         Bundle args = new Bundle();
@@ -398,12 +402,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                         return;
                     }
 
-                    String name = "";
-                    {
-                        MrContact mrContact = MrMailbox.getContact(user_id);
-                        name = mrContact.getNameNAddr();
-                    }
-
+                    String name = MrMailbox.getContact(user_id).getNameNAddr();
                     AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
                     builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() {
                         @Override
@@ -422,9 +421,37 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                     builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
                     builder.setMessage(AndroidUtilities.replaceTags(LocaleController.formatString("AskStartChatWith", R.string.AskStartChatWith, name)));
                     showDialog(builder.create());
-                } else if (position == addMemberRow) {
-                    openAddMember();
-                } else if (position >= firstMemberRow && position <= lastMemberRow) {
+                }
+                else if (position == addMemberRow)
+                {
+                    Bundle args = new Bundle();
+                    args.putInt("do_what", ContactsActivity.ADD_CONTACTS_TO_GROUP);
+                    ContactsActivity fragment = new ContactsActivity(args);
+                    fragment.setDelegate(new ContactsActivity.ContactsActivityDelegate() {
+                        @Override
+                        public void didSelectContact(final int added_user_id) {
+                            AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
+                            builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialogInterface, int i) {
+                                    MrMailbox.addContactToChat(chat_id, added_user_id);
+                                    sortedUserIds = MrMailbox.getChatContacts(chat_id);
+                                    updateRowsIds();
+                                    updateProfileData();
+                                    listAdapter.notifyDataSetChanged();
+                                    NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, MessagesController.UPDATE_MASK_CHAT_MEMBERS);
+                                }
+                            });
+                            builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
+                            String name = MrMailbox.getContact(added_user_id).getDisplayName();
+                            builder.setMessage(AndroidUtilities.replaceTags(LocaleController.formatString("AskAddMemberToGroup", R.string.AskAddMemberToGroup, name)));
+                            showDialog(builder.create());
+                        }
+                    });
+                    presentFragment(fragment);
+                }
+                else if (position >= firstMemberRow && position <= lastMemberRow)
+                {
                     int curr_user_index = position - firstMemberRow;
                     if(curr_user_index>=0 && curr_user_index<sortedUserIds.length) {
                         int curr_user_id = sortedUserIds[curr_user_index];
@@ -434,7 +461,9 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                             presentFragment(new ProfileActivity(args));
                         }
                     }
-                } else {
+                }
+                else
+                {
                     processOnClickOrPress(position);
                 }
             }
@@ -449,22 +478,32 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                     if(curr_user_index>=0 && curr_user_index<sortedUserIds.length)
                     {
                         final int curr_user_id = sortedUserIds[curr_user_index];
-                        if( curr_user_id!=MrContact.MR_CONTACT_ID_SELF  ) {
-                            AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
-                            CharSequence[] items = new CharSequence[]{LocaleController.getString("KickFromGroup", R.string.KickFromGroup)};
-                            builder.setItems(items, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialogInterface, int i) {
-                                    MrMailbox.removeContactFromChat(chat_id, curr_user_id);
-                                    sortedUserIds = MrMailbox.getChatContacts(chat_id);
-                                    updateRowsIds();
-                                    updateProfileData();
-                                    listAdapter.notifyDataSetChanged();
-                                    NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, MessagesController.UPDATE_MASK_CHAT_MEMBERS);
-                                }
-                            });
-                            showDialog(builder.create());
-                        }
+                        AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
+                        CharSequence[] items = new CharSequence[]{LocaleController.getString("RemoveMember", R.string.RemoveMember)};
+                        builder.setItems(items, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+
+                                AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
+                                builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                        MrMailbox.removeContactFromChat(chat_id, curr_user_id);
+                                        sortedUserIds = MrMailbox.getChatContacts(chat_id);
+                                        updateRowsIds();
+                                        updateProfileData();
+                                        listAdapter.notifyDataSetChanged();
+                                        NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, MessagesController.UPDATE_MASK_CHAT_MEMBERS);
+                                    }
+                                });
+                                builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
+                                String name = MrMailbox.getContact(curr_user_id).getDisplayName();
+                                builder.setMessage(AndroidUtilities.replaceTags(LocaleController.formatString("AskRemoveMemberFromGroup", R.string.AskRemoveMemberFromGroup, name)));
+                                showDialog(builder.create());
+                            }
+                        });
+                        showDialog(builder.create());
+
                     }
                     return true;
                 } else
@@ -631,25 +670,6 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
         }
     }
 
-    private void openAddMember() {
-
-        Bundle args = new Bundle();
-        args.putInt("do_what", ContactsActivity.ADD_CONTACTS_TO_GROUP);
-        ContactsActivity fragment = new ContactsActivity(args);
-        fragment.setDelegate(new ContactsActivity.ContactsActivityDelegate() {
-            @Override
-            public void didSelectContact(int added_user_id) {
-                MrMailbox.addContactToChat(chat_id, added_user_id);
-                sortedUserIds = MrMailbox.getChatContacts(chat_id);
-                updateRowsIds();
-                updateProfileData();
-                listAdapter.notifyDataSetChanged();
-                NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, MessagesController.UPDATE_MASK_CHAT_MEMBERS);
-            }
-        });
-        presentFragment(fragment);
-    }
-
     private void checkListViewScroll() {
         if (listView.getChildCount() <= 0 || openAnimationInProgress) {
             return;
diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml
index 851624511..7f564f630 100644
--- a/MessengerProj/src/main/res/values-de/strings.xml
+++ b/MessengerProj/src/main/res/values-de/strings.xml
@@ -109,7 +109,7 @@
     <string name="AddMember">Mitglied hinzufügen</string>
     <string name="DeleteAndExit">Löschen und Gruppe verlassen</string>
     <string name="Notifications">Mitteilungen</string>
-    <string name="KickFromGroup">Aus der Gruppe entfernen</string>
+    <string name="RemoveMember">Mitglied entfernen</string>
     <!--contact info view-->
     <string name="ShareContact">Teilen</string>
     <string name="AddContact">Hinzufügen</string>
@@ -535,10 +535,10 @@
     <string name="AboutThisProgram">Über Delta Chat</string>
     <string name="NotSet">Nicht gesetzt</string>
     <string name="NewChat">Neuer Chat</string>
-    <string name="ContactPl">_ Kontakte</string>
-    <string name="ContactSg">_ Kontakt</string>
-    <string name="MemberSg">_ Mitglied</string>
-    <string name="MemberPl">_ Mitglieder</string>
+    <string name="ContactPl">## Kontakte</string>
+    <string name="ContactSg">## Kontakt</string>
+    <string name="MemberSg">## Mitglied</string>
+    <string name="MemberPl">## Mitglieder</string>
     <string name="Deaddrop">Briefkasten</string>
     <string name="Media">Medien</string>
     <string name="DeaddropInChatlist">Briefkasten in Chatliste</string>
@@ -568,10 +568,12 @@
     <string name="AskResetNotifications">Alle Benachrichtigungseinstellungen und Töne dieser Seite, der Kontakte und der Gruppen zurücksetzen?</string>
     <string name="AttachFiles">Dateien anhängen</string>
     <string name="ErrGroupNameEmpty">Bitte einen Namen für die Gruppe eingeben.</string>
-    <string name="MsgNewGroupDraft">Hallo, ich habe die Gruppe \"_\" für uns erstellt.</string>
+    <string name="MsgNewGroupDraft">Hallo, ich habe die Gruppe \"##\" für uns erstellt.</string>
     <string name="MsgNewGroupDraftHint">Eine erste Nachricht schreiben; dann können die anderen in der Gruppe antworten.</string>
     <string name="MsgGroupImageChanged">Gruppenbild geändert.</string>
-    <string name="MsgGroupNameChanged">Gruppenname von \"_\" in \"_\" geändert.</string>
-    <string name="MsgMemberAddedToGroup">\"_\" zur Gruppe hinzugefügt.</string>
-    <string name="MsgMemberRemovedFromToGroup">\"_\" aus Gruppe entfernt.</string>
+    <string name="MsgGroupNameChanged">Gruppenname von \"##\" in \"##\" geändert.</string>
+    <string name="MsgMemberAddedToGroup">## zur Gruppe hinzugefügt.</string>
+    <string name="MsgMemberRemovedFromToGroup">## aus Gruppe entfernt.</string>
+    <string name="AskAddMemberToGroup">Benutzer <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> zur Gruppe hinzufügen?</string>
+    <string name="AskRemoveMemberFromGroup">Benutzer <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> aus Gruppe entfernen?</string>
 </resources>
diff --git a/MessengerProj/src/main/res/values-es/strings.xml b/MessengerProj/src/main/res/values-es/strings.xml
index 7fecb0cbb..fe94b2195 100644
--- a/MessengerProj/src/main/res/values-es/strings.xml
+++ b/MessengerProj/src/main/res/values-es/strings.xml
@@ -109,7 +109,7 @@
     <string name="AddMember">Añadir miembro</string>
     <string name="DeleteAndExit">Eliminar y dejar el grupo</string>
     <string name="Notifications">Notificaciones</string>
-    <string name="KickFromGroup">Eliminar del grupo</string>
+    <string name="RemoveMember">Eliminar del grupo</string>
     <!--contact info view-->
     <string name="ShareContact">Compartir</string>
     <string name="AddContact">Añadir</string>
@@ -332,7 +332,7 @@
     <string name="NoPlayerInstalled">No tienes reproductor de vídeo. Por favor, instala uno para continuar.</string>
     <string name="NoHandleAppInstalled">No tienes aplicaciones que puedan manejar el tipo de archivo “%1$s”. Por favor, instala una para continuar.</string>
     <string name="AddToTheGroupTitle">¿Añadir a %1$s al chat %2$s?</string>
-    <string name="AddToTheGroup">¿Añadir a %1$s al grupo?</string>
+    <string name="AskAddMemberToGroup">¿Añadir a <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> al grupo?</string>
     <string name="UserAlreadyInGroup">Este usuario ya está en el grupo</string>
     <string name="ForwardMessagesTo">¿Reenviar mensajes a %1$s?</string>
     <string name="SendMessagesTo">¿Enviar mensajes a %1$s?</string>
diff --git a/MessengerProj/src/main/res/values-it/strings.xml b/MessengerProj/src/main/res/values-it/strings.xml
index 1b7067665..f95097f80 100644
--- a/MessengerProj/src/main/res/values-it/strings.xml
+++ b/MessengerProj/src/main/res/values-it/strings.xml
@@ -109,7 +109,7 @@
     <string name="AddMember">Aggiungi membro</string>
     <string name="DeleteAndExit">Elimina e lascia il gruppo</string>
     <string name="Notifications">Notifiche</string>
-    <string name="KickFromGroup">Rimuovi dal gruppo</string>
+    <string name="RemoveMember">Rimuovi dal gruppo</string>
     <!--contact info view-->
     <string name="ShareContact">Condividi</string>
     <string name="AddContact">Aggiungi</string>
@@ -332,7 +332,7 @@
     <string name="NoPlayerInstalled">Non hai un lettore video, per favore installane uno per continuare</string>
     <string name="NoHandleAppInstalled">Non hai applicazioni che possono gestire il tipo di file \'%1$s\': installane una per proseguire</string>
     <string name="AddToTheGroupTitle">Aggiungere %1$s alla chat %2$s?</string>
-    <string name="AddToTheGroup">Aggiungere %1$s al gruppo?</string>
+    <string name="AskAddMemberToGroup">Aggiungere <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> al gruppo?</string>
     <string name="UserAlreadyInGroup">Questo utente è già membro del gruppo</string>
     <string name="ForwardMessagesTo">Vuoi inoltrare i messaggi a %1$s?</string>
     <string name="SendMessagesTo">Inviare i messaggi a %1$s?</string>
diff --git a/MessengerProj/src/main/res/values-nl/strings.xml b/MessengerProj/src/main/res/values-nl/strings.xml
index 52d480057..690059631 100644
--- a/MessengerProj/src/main/res/values-nl/strings.xml
+++ b/MessengerProj/src/main/res/values-nl/strings.xml
@@ -109,7 +109,7 @@
     <string name="AddMember">Lid toevoegen</string>
     <string name="DeleteAndExit">Groep verwijderen en verlaten</string>
     <string name="Notifications">Meldingen</string>
-    <string name="KickFromGroup">Verwijderen uit groep</string>
+    <string name="RemoveMember">Verwijderen uit groep</string>
     <!--contact info view-->
     <string name="ShareContact">Delen</string>
     <string name="AddContact">Toevoegen</string>
@@ -332,7 +332,7 @@
     <string name="NoPlayerInstalled">Je hebt geen mediaspeler. Installeer een mediaspeler om door te gaan.</string>
     <string name="NoHandleAppInstalled">Je hebt geen apps die bestandstype \'%1$s\' kunnen verwerken, gelieve een compatibele app te installeren</string>
     <string name="AddToTheGroupTitle">%1$s toevoegen aan de groep %2$s?</string>
-    <string name="AddToTheGroup">%1$s toevoegen aan de groep?</string>
+    <string name="AskAddMemberToGroup"><![CDATA[<b>]]>%1$s<![CDATA[</b>]]> toevoegen aan de groep?</string>
     <string name="UserAlreadyInGroup">Gebruiker is al een groepslid</string>
     <string name="ForwardMessagesTo">Berichten doorsturen naar %1$s?</string>
     <string name="SendMessagesTo">Berichten naar %1$s versturen?</string>
diff --git a/MessengerProj/src/main/res/values-pt/strings.xml b/MessengerProj/src/main/res/values-pt/strings.xml
index 411be3c96..7fe7192ea 100644
--- a/MessengerProj/src/main/res/values-pt/strings.xml
+++ b/MessengerProj/src/main/res/values-pt/strings.xml
@@ -109,7 +109,7 @@
     <string name="AddMember">Adicionar membro</string>
     <string name="DeleteAndExit">Apagar e sair do grupo</string>
     <string name="Notifications">Notificações</string>
-    <string name="KickFromGroup">Remover do grupo</string>
+    <string name="RemoveMember">Remover do grupo</string>
     <!--contact info view-->
     <string name="ShareContact">Compartilhar</string>
     <string name="AddContact">Adicionar</string>
@@ -332,7 +332,7 @@
     <string name="NoPlayerInstalled">Você não possui um reprodutor de vídeo, instale um para continuar</string>
     <string name="NoHandleAppInstalled">Você não possui um aplicativo que suporte o tipo de arquivo \'%1$s\', por favor instale um para continuar</string>
     <string name="AddToTheGroupTitle">Adcione %1$s ao chat %2$s?</string>
-    <string name="AddToTheGroup">Adicionar %1$s no grupo?</string>
+    <string name="AskAddMemberToGroup">Adicionar <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> no grupo?</string>
     <string name="UserAlreadyInGroup">Este usuário já está neste grupo</string>
     <string name="ForwardMessagesTo">Encaminhar mensagem para %1$s?</string>
     <string name="SendMessagesTo">Enviar mensagens para %1$s?</string>
diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml
index cc804ee8a..082e0923c 100644
--- a/MessengerProj/src/main/res/values/strings.xml
+++ b/MessengerProj/src/main/res/values/strings.xml
@@ -109,7 +109,7 @@
     <string name="AddMember">Add member</string>
     <string name="DeleteAndExit">Delete and leave group</string>
     <string name="Notifications">Notifications</string>
-    <string name="KickFromGroup">Remove from group</string>
+    <string name="RemoveMember">Remove member</string>
     <!--contact info view-->
     <string name="ShareContact">Share</string>
     <string name="AddContact">Add</string>
@@ -533,10 +533,10 @@
     <string name="AboutThisProgram">About Delta Chat</string>
     <string name="NotSet">Not set</string>
     <string name="NewChat">New chat</string>
-    <string name="MemberSg">_ member</string>
-    <string name="MemberPl">_ members</string>
-    <string name="ContactSg">_ contact</string>
-    <string name="ContactPl">_ contacts</string>
+    <string name="MemberSg">## member</string>
+    <string name="MemberPl">## members</string>
+    <string name="ContactSg">## contact</string>
+    <string name="ContactPl">## contacts</string>
     <string name="Deaddrop">Mailbox</string>
     <string name="Media">Media</string>
     <string name="DeaddropInChatlist">Show mailbox in chatlist</string>
@@ -569,9 +569,11 @@
     <string name="Chats">Chats</string>
     <string name="ErrGroupNameEmpty">Please enter a name for the group.</string>
     <string name="MsgNewGroupDraftHint">Write a first message to allow others to reply in this group.</string>
-    <string name="MsgNewGroupDraft">Hello, I\'ve just created the group \"_\" for us.</string>
-    <string name="MsgGroupNameChanged">Group name changed from \"_\" to \"_\".</string>
+    <string name="MsgNewGroupDraft">Hello, I\'ve just created the group \"##\" for us.</string>
+    <string name="MsgGroupNameChanged">Group name changed from \"##\" to \"##\".</string>
     <string name="MsgGroupImageChanged">Group image changed.</string>
-    <string name="MsgMemberAddedToGroup">Member \"_\" added.</string>
-    <string name="MsgMemberRemovedFromToGroup">Member \"_\" removed.</string>
+    <string name="MsgMemberAddedToGroup">Member ## added.</string>
+    <string name="MsgMemberRemovedFromToGroup">Member ## removed.</string>
+    <string name="AskAddMemberToGroup">Add user <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> to group?</string>
+    <string name="AskRemoveMemberFromGroup">Remove user <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> from group?</string>
 </resources>