diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
index dea98eaa9..228e7900e 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
@@ -134,7 +134,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
     private FrameLayout bottomOverlay;
     protected ChatActivityEnterView chatActivityEnterView;
     private ActionBarMenuItem menuItem;
-    private ActionBarMenuItem attachItem;
     private ActionBarMenuItem headerItem;
     private ActionBarMenuItem searchItem;
     private LinearLayoutManager chatLayoutManager;
@@ -200,7 +199,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
     private final static int id_copy = 10;
     private final static int id_forward = 11;
     private final static int id_delete_messages = 12;
-    private final static int chat_menu_attach = 14;
+    private final static int id_attach = 14;
     private final static int id_delete_chat = 16;
     private final static int mute = 18;
     private final static int id_reply = 19;
@@ -512,7 +511,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                     }
                     actionBar.hideActionMode();
                     updateVisibleRows();
-                } else if (id == chat_menu_attach) {
+                } else if (id == id_attach) {
                     if (getParentActivity() == null) {
                         return;
                     }
@@ -541,21 +540,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 @Override
                 public void onSearchCollapse() {
                     avatarContainer.setVisibility(View.VISIBLE);
-                    if (chatActivityEnterView.hasText()) {
-                        if (headerItem != null) {
-                            headerItem.setVisibility(View.GONE);
-                        }
-                        if (attachItem != null) {
-                            attachItem.setVisibility(View.VISIBLE);
-                        }
-                    } else {
-                        if (headerItem != null) {
-                            headerItem.setVisibility(View.VISIBLE);
-                        }
-                        if (attachItem != null) {
-                            attachItem.setVisibility(View.GONE);
-                        }
-                    }
+                    headerItem.setVisibility(View.VISIBLE);
                     searchItem.setVisibility(View.GONE);
                     highlightMessageId = Integer.MAX_VALUE;
                     updateVisibleRows();
@@ -604,6 +589,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
         }
 
         if( !isChatWithDeaddrop ) {
+            headerItem.addSubItem(id_attach, LocaleController.getString("SendFiles", R.string.SendFiles), 0);
             if (m_mrChat.getType() == MrChat.MR_CHAT_GROUP) {
                 headerItem.addSubItem(id_delete_chat, LocaleController.getString("DeleteAndExit", R.string.DeleteAndExit), 0);
             } else {
@@ -615,9 +601,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
         avatarContainer.updateSubtitle();
         updateTitleIcons();
 
-        attachItem = menu.addItem(chat_menu_attach, R.drawable.ic_ab_other).setOverrideMenuClick(true).setAllowCloseAnimation(false);
-        attachItem.setVisibility(View.GONE);
-        menuItem = menu.addItem(chat_menu_attach, R.drawable.ic_ab_attach).setAllowCloseAnimation(false);
+        menuItem = menu.addItem(id_attach, R.drawable.ic_ab_attach).setAllowCloseAnimation(false); // "menuItem" is added to ChatEnterViewActivity
         menuItem.setBackgroundDrawable(null);
 
         actionModeViews.clear();
@@ -1101,35 +1085,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 MessagesController.getInstance().sendTyping(dialog_id, 0, classGuid);
             }
 
-            @Override
-            public void onAttachButtonHidden() {
-                if (actionBar.isSearchFieldVisible()) {
-                    return;
-                }
-                if (attachItem != null) {
-                    attachItem.setVisibility(View.VISIBLE);
-                }
-                if (headerItem != null) {
-                    headerItem.setVisibility(View.GONE);
-                }
-            }
-
-            @Override
-            public void onAttachButtonShow() {
-                if (actionBar.isSearchFieldVisible()) {
-                    return;
-                }
-                if (attachItem != null) {
-                    attachItem.setVisibility(View.GONE);
-                }
-                if (headerItem != null) {
-                    headerItem.setVisibility(View.VISIBLE);
-                }
-            }
-
             @Override
             public void onWindowSizeChanged(int size) {
-
             }
 
             @Override
@@ -2750,7 +2707,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
     private void openSearchWithText(String text) {
         avatarContainer.setVisibility(View.GONE);
         headerItem.setVisibility(View.GONE);
-        attachItem.setVisibility(View.GONE);
+        //attachItem.setVisibility(View.GONE);
         searchItem.setVisibility(View.VISIBLE);
         updateSearchButtons(0, 0, 0);
         updateBottomOverlay();
diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java
index 4873c2b99..0586c3c12 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java
@@ -94,8 +94,8 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
         void onMessageSend(CharSequence message);
         void needSendTyping();
         void onTextChanged(CharSequence text, boolean bigChange);
-        void onAttachButtonHidden();
-        void onAttachButtonShow();
+        //void onAttachButtonHidden();
+        //void onAttachButtonShow();
         void onWindowSizeChanged(int size);
         void onStickersTab(boolean opened);
         //void onMessageEditEnd(boolean loading);
@@ -1308,9 +1308,9 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                         });
                         runningAnimation2.start();
                         updateFieldRight(0);
-                        if (delegate != null) {
+                        /*if (delegate != null) {
                             delegate.onAttachButtonHidden();
-                        }
+                        }*/
                     }
 
                     runningAnimation = new AnimatorSet();
@@ -1397,9 +1397,9 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                     audioSendButton.setVisibility(GONE);
                     if (attachButton != null) {
                         attachButton.setVisibility(GONE);
-                        if (delegate != null) {
+                        /*if (delegate != null) {
                             delegate.onAttachButtonHidden();
-                        }
+                        }*/
                         updateFieldRight(0);
                     }
                 }
@@ -1429,7 +1429,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                     runningAnimation2.setDuration(100);
                     runningAnimation2.start();
                     updateFieldRight(1);
-                    delegate.onAttachButtonShow();
+                    //delegate.onAttachButtonShow();
                 }
 
                 audioSendButton.setVisibility(VISIBLE);
@@ -1486,7 +1486,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                 sendButton.setVisibility(GONE);
                 audioSendButton.setVisibility(VISIBLE);
                 if (attachButton != null) {
-                    delegate.onAttachButtonShow();
+                    //delegate.onAttachButtonShow();
                     attachButton.setVisibility(VISIBLE);
                     updateFieldRight(1);
                 }
diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml
index 9379990cb..dff189006 100644
--- a/MessengerProj/src/main/res/values-de/strings.xml
+++ b/MessengerProj/src/main/res/values-de/strings.xml
@@ -583,4 +583,5 @@
     <string name="AdvancedSettings">Fortgeschrittene Einstellungen</string>
     <string name="CannotConnect"></string>
     <string name="AskResetNotifications">Alle Benachrichtigungseinstellungen und Töne dieser Seite, der Kontakte und der Gruppen zurücksetzen?</string>
+    <string name="SendFiles">Dateien senden</string>
 </resources>
diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml
index 45eb512c0..f8e9bf168 100644
--- a/MessengerProj/src/main/res/values/strings.xml
+++ b/MessengerProj/src/main/res/values/strings.xml
@@ -582,4 +582,5 @@
     <string name="InviteText">I\'m using Delta Chat messenger now - %1$s - you can text me at %2$s</string>
     <string name="AdvancedSettings">Advanced settings</string>
     <string name="AskResetNotifications" >Reset all notification settings and sounds of this page and of your contacts and groups?</string>
+    <string name="SendFiles">Send files</string>
 </resources>