diff --git a/src/lib/messaging.js b/src/lib/messaging.js
index b887dcd3..7c924c2a 100644
--- a/src/lib/messaging.js
+++ b/src/lib/messaging.js
@@ -3,6 +3,7 @@ import { getChash160, isValidAddress } from 'obyte/lib/utils';
 import { getSignedMessageInfoFromJsonBase64 } from './oCustom';
 
 export const REG_WALLET_ADDRESS = /(.*?\s|^)([2-7A-Z]{32})([\s.,;!:].*?|$)/g;
+// export const REG_WALLET_ADDRESS = /^([A-Z0-9]{32})$/g;
 export const REG_REQUEST_PAYMENT = /\[.*?\]\(((?:byteball-tn|byteball|obyte-tn|obyte):([0-9A-Z]{32})(?:\?([\w=&;+%]+))?)\)/g;
 export const REGEX_SIGN_MESSAGE_REQUEST = /\[(.+?)\]\(sign-message-request(-network-aware)?:(.+?)\)/g;
 export const REGEX_SIGNED_MESSAGE = /\[(.+?)\]\(signed-message:([\w\/+=]+?)\)/g;
@@ -61,9 +62,9 @@ export const parseTextMessage = originalText => {
       type = 'PROSAIC_CONTRACT';
       return toDelayedReplacement({ type, text: '[UNSUPPORTED ACTION]' });
     })
-    .replace(REG_WALLET_ADDRESS, (str, description, address) => {
+    .replace(REG_WALLET_ADDRESS, (str, pre, address, post) => {
       type = 'WALLET_ADDRESS';
-      return toDelayedReplacement({ type, description, address });
+      return `${pre}${toDelayedReplacement({ type, address })}${post}`;
     })
     .replace(REG_REQUEST_PAYMENT, (str, payload, address, amount) => {
       type = 'REQUEST_PAYMENT';
diff --git a/src/screens/ChatScreen/index.js b/src/screens/ChatScreen/index.js
index fe6f0dc6..02386c79 100644
--- a/src/screens/ChatScreen/index.js
+++ b/src/screens/ChatScreen/index.js
@@ -84,15 +84,14 @@ const ChatScreen = ({
           )
         }
         case "WALLET_ADDRESS": {
-          const { address, description } = data;
+          const { address, pre, post } = data;
           return user._id !== 1
             ? (
               <TouchableOpacity onPress={() => navigation.navigate('MakePayment', { walletAddress: data.address })}>
-                {description ? <Text style={style}>{description}</Text> : null}
                 <Text style={replacedStyle}>{address}</Text>
               </TouchableOpacity>
             )
-            : <Text style={style}>{description ? `${description}${address}` : address}</Text>
+            : <Text style={style}>{address}</Text>
         }
         case "REQUEST_PAYMENT": {
           const { amount, address } = data;
diff --git a/src/screens/TransactionInfoScreen/index.js b/src/screens/TransactionInfoScreen/index.js
index 9cf86a73..ea289168 100644
--- a/src/screens/TransactionInfoScreen/index.js
+++ b/src/screens/TransactionInfoScreen/index.js
@@ -38,7 +38,7 @@ class TransactionInfoScreen extends React.Component {
           titlePosition='center'
           hasBackButton
         />
-        <View contentContainerStyle={styles.content}>
+        <View style={styles.content}>
           <View style={styles.amountBlock}>
             <View style={styles.amountRow}>
               <Text style={styles.primaryAmount}>