diff --git a/__tests__/__snapshots__/History.snapshot.tsx.snap b/__tests__/__snapshots__/History.snapshot.tsx.snap
index f00ac2255..6854532e9 100644
--- a/__tests__/__snapshots__/History.snapshot.tsx.snap
+++ b/__tests__/__snapshots__/History.snapshot.tsx.snap
@@ -815,7 +815,7 @@ exports[`Component History - test History currency USD, privacy high & mode adva
                 "borderColor": "#18bd18",
                 "borderRadius": 15,
                 "borderWidth": 1,
-                "marginHorizontal": 0,
+                "marginHorizontal": 10,
                 "paddingHorizontal": 10,
                 "paddingVertical": 5,
               }
@@ -875,7 +875,7 @@ exports[`Component History - test History currency USD, privacy high & mode adva
                 "borderColor": "#888888",
                 "borderRadius": 15,
                 "borderWidth": 1,
-                "marginHorizontal": 10,
+                "marginHorizontal": 0,
                 "paddingHorizontal": 10,
                 "paddingVertical": 5,
               }
@@ -1395,7 +1395,7 @@ exports[`Component History - test History no currency, privacy normal & mode bas
                 "borderColor": "#18bd18",
                 "borderRadius": 15,
                 "borderWidth": 1,
-                "marginHorizontal": 0,
+                "marginHorizontal": 10,
                 "paddingHorizontal": 10,
                 "paddingVertical": 5,
               }
@@ -1455,7 +1455,7 @@ exports[`Component History - test History no currency, privacy normal & mode bas
                 "borderColor": "#888888",
                 "borderRadius": 15,
                 "borderWidth": 1,
-                "marginHorizontal": 10,
+                "marginHorizontal": 0,
                 "paddingHorizontal": 10,
                 "paddingVertical": 5,
               }
diff --git a/__tests__/__snapshots__/Messages.snapshot.tsx.snap b/__tests__/__snapshots__/Messages.snapshot.tsx.snap
index bfdb3083a..f26a9bf06 100644
--- a/__tests__/__snapshots__/Messages.snapshot.tsx.snap
+++ b/__tests__/__snapshots__/Messages.snapshot.tsx.snap
@@ -1,11 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Component Messages - test Messages currency USD, privacy high & mode advanced - snapshot 1`] = `
-<View
+<RCTSafeAreaView
   accessibilityLabel="text translated"
   accessible={true}
   style={
     {
+      "backgroundColor": "#011401",
       "display": "flex",
       "height": "100%",
       "justifyContent": "flex-start",
@@ -614,15 +615,16 @@ exports[`Component Messages - test Messages currency USD, privacy high & mode ad
       }
     }
   />
-</View>
+</RCTSafeAreaView>
 `;
 
 exports[`Component Messages - test Messages no currency, privacy normal & mode basic - snapshot 1`] = `
-<View
+<RCTSafeAreaView
   accessibilityLabel="text translated"
   accessible={true}
   style={
     {
+      "backgroundColor": "#011401",
       "display": "flex",
       "height": "100%",
       "justifyContent": "flex-start",
@@ -1196,5 +1198,5 @@ exports[`Component Messages - test Messages no currency, privacy normal & mode b
       }
     }
   />
-</View>
+</RCTSafeAreaView>
 `;
diff --git a/components/History/components/ValueTransferLine.tsx b/components/History/components/ValueTransferLine.tsx
index b5f5f78ce..49b497b13 100644
--- a/components/History/components/ValueTransferLine.tsx
+++ b/components/History/components/ValueTransferLine.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable react-native/no-inline-styles */
-import React, { useContext, useEffect, useRef, useState } from 'react';
-import { Animated, Dimensions, Platform, View, TouchableOpacity } from 'react-native';
+import React, { useContext, useRef } from 'react';
+import { Animated, Platform, View, TouchableOpacity } from 'react-native';
 import { useTheme } from '@react-navigation/native';
 import { FontAwesomeIcon } from '@fortawesome/react-native-fontawesome';
 import {
@@ -9,7 +9,7 @@ import {
   faRefresh,
   faComment,
   faTriangleExclamation,
-  faComments,
+  //faComments,
   faFileLines,
   faPaperPlane,
 } from '@fortawesome/free-solid-svg-icons';
@@ -35,7 +35,7 @@ import 'moment/locale/ru';
 import { ContextAppLoaded } from '../../../app/context';
 import AddressItem from '../../Components/AddressItem';
 import { RPCValueTransfersStatusEnum } from '../../../app/rpc/enums/RPCValueTransfersStatusEnum';
-import Utils from '../../../app/utils';
+//import Utils from '../../../app/utils';
 
 type ValueTransferLineProps = {
   index: number;
@@ -56,7 +56,7 @@ const ValueTransferLine: React.FunctionComponent<ValueTransferLineProps> = ({
   setValueTransferDetailIndex,
   setValueTransferDetailModalShowing,
   nextLineWithSameTxid,
-  setMessagesAddressModalShowing,
+  //setMessagesAddressModalShowing,
   addressProtected,
 }) => {
   const context = useContext(ContextAppLoaded);
@@ -74,13 +74,13 @@ const ValueTransferLine: React.FunctionComponent<ValueTransferLineProps> = ({
   const { colors } = useTheme() as unknown as ThemeType;
   moment.locale(language);
 
-  const [messagesAddress, setMessagesAddress] = useState<boolean>(false);
+  //const [messagesAddress, setMessagesAddress] = useState<boolean>(false);
 
-  const dimensions = {
-    width: Dimensions.get('window').width,
-    height: Dimensions.get('window').height,
-  };
-  const maxWidthHit = useRef<boolean>(false);
+  //const dimensions = {
+  //  width: Dimensions.get('window').width,
+  //  height: Dimensions.get('window').height,
+  //};
+  //const maxWidthHit = useRef<boolean>(false);
   const swipeableRef = useRef<Swipeable | null>(null);
 
   const getAmountColor = (_vt: ValueTransferType) => {
@@ -104,9 +104,9 @@ const ValueTransferLine: React.FunctionComponent<ValueTransferLineProps> = ({
     return _vt.memos && _vt.memos.length > 0 && !!_vt.memos.join('');
   };
 
-  useEffect(() => {
-    setMessagesAddress(Utils.isMessagesAddress(vt));
-  }, [vt]);
+  //useEffect(() => {
+  //  setMessagesAddress(Utils.isMessagesAddress(vt));
+  //}, [vt]);
 
   /*
   const handleRenderRightActions = (
diff --git a/components/Messages/MessagesModal.tsx b/components/Messages/MessagesModal.tsx
index 0b3ab3f80..840e54a73 100644
--- a/components/Messages/MessagesModal.tsx
+++ b/components/Messages/MessagesModal.tsx
@@ -1,12 +1,8 @@
-/* eslint-disable react-native/no-inline-styles */
 import React, { useContext } from 'react';
 import { SelectServerEnum, SendPageStateClass, ServerType } from '../../app/AppState';
 import ContactList from './components/ContactList';
-import { useTheme } from '@react-navigation/native';
-import { ThemeType } from '../../app/types';
 import moment from 'moment';
 import { ContextAppLoaded } from '../../app/context';
-import { SafeAreaView } from 'react-native-safe-area-context';
 
 type MessagesModalProps = {
   // side menu
@@ -48,7 +44,6 @@ const MessagesModal: React.FunctionComponent<MessagesModalProps> = ({
 }) => {
   const context = useContext(ContextAppLoaded);
   const { language } = context;
-  const { colors } = useTheme() as unknown as ThemeType;
   moment.locale(language);
 
   return (