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 5267fed60..217522b25 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java
@@ -1018,12 +1018,10 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                     }
                     runningAnimationType = 1;
 
-                    if( !sendByEnter ) {
-                        animators.add(ObjectAnimator.ofFloat(sendButton, "scaleX", 1.0f));
-                        animators.add(ObjectAnimator.ofFloat(sendButton, "scaleY", 1.0f));
-                        animators.add(ObjectAnimator.ofFloat(sendButton, "alpha", 1.0f));
-                        sendButton.setVisibility(VISIBLE);
-                    }
+                    animators.add(ObjectAnimator.ofFloat(sendButton, "scaleX", 1.0f));
+                    animators.add(ObjectAnimator.ofFloat(sendButton, "scaleY", 1.0f));
+                    animators.add(ObjectAnimator.ofFloat(sendButton, "alpha", 1.0f));
+                    sendButton.setVisibility(VISIBLE);
 
                     runningAnimation.playTogether(animators);
                     runningAnimation.setDuration(150);
@@ -1032,9 +1030,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                         public void onAnimationEnd(Animator animation) {
                             if (runningAnimation != null && runningAnimation.equals(animation)) {
 
-                                if( !sendByEnter ) {
-                                    sendButton.setVisibility(VISIBLE);
-                                }
+                                sendButton.setVisibility(VISIBLE);
 
                                 audioRecordButton.setVisibility(GONE);
                                 runningAnimation = null;
@@ -1055,12 +1051,10 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                     audioRecordButton.setScaleY(0.1f);
                     audioRecordButton.setAlpha(0.0f);
 
-                    if( !sendByEnter ) {
-                        sendButton.setScaleX(1.0f);
-                        sendButton.setScaleY(1.0f);
-                        sendButton.setAlpha(1.0f);
-                        sendButton.setVisibility(VISIBLE);
-                    }
+                    sendButton.setScaleX(1.0f);
+                    sendButton.setScaleY(1.0f);
+                    sendButton.setAlpha(1.0f);
+                    sendButton.setVisibility(VISIBLE);
 
                     audioRecordButton.setVisibility(GONE);
                     if (attachButton != null) {
diff --git a/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java
index 7e6692af0..de0c5e0b2 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java
@@ -119,8 +119,8 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
         privacyRow = rowCount++;
         notificationRow = rowCount++;
         backgroundRow = rowCount++;
-        messagesSectionRow = -1; // rowCount++;
-        messagesSectionRow2 = -1; // rowCount++;
+        messagesSectionRow = rowCount++;
+        messagesSectionRow2 = rowCount++;
         if (Build.VERSION.SDK_INT >= 23) {
             directShareRow = -1; // for now, seems not really to work, however, in T'gram it does
         }