diff --git a/iphone/Maps/UI/Editor/Cells/MWMNoteCell.m b/iphone/Maps/UI/Editor/Cells/MWMNoteCell.m
index 8839fa549d..16bec6b4c6 100644
--- a/iphone/Maps/UI/Editor/Cells/MWMNoteCell.m
+++ b/iphone/Maps/UI/Editor/Cells/MWMNoteCell.m
@@ -3,7 +3,7 @@
 
 static CGFloat const kTopTextViewOffset = 12.;
 static NSString *const kTextViewContentSizeKeyPath = @"contentSize";
-static CGFloat const kMinimalTextViewHeight = 104.;
+static CGFloat const kMinimalTextViewHeight = 44.;
 static void *kContext = &kContext;
 
 @interface MWMNoteCell () <UITextViewDelegate>
diff --git a/iphone/Maps/UI/Editor/Cells/MWMNoteCell.xib b/iphone/Maps/UI/Editor/Cells/MWMNoteCell.xib
index c793ea22af..08622f8e22 100644
--- a/iphone/Maps/UI/Editor/Cells/MWMNoteCell.xib
+++ b/iphone/Maps/UI/Editor/Cells/MWMNoteCell.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -20,7 +20,7 @@
                         <rect key="frame" x="16" y="12" width="288" height="105"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="104" id="J3M-HG-f2p"/>
+                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44" id="J3M-HG-f2p"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                         <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
index 72c68e75e1..60307afb8a 100644
--- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
@@ -791,7 +791,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellID> const & cells, UITab
 
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
 {
-  return kDefaultHeaderHeight;
+  return m_sections[section] == MWMEditorSectionNote ? kDefaultHeaderHeight * 2 : kDefaultHeaderHeight;
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section