diff --git a/web/cashtab/package-lock.json b/web/cashtab/package-lock.json
--- a/web/cashtab/package-lock.json
+++ b/web/cashtab/package-lock.json
@@ -16,6 +16,7 @@
                 "dotenv": "^8.2.0",
                 "dotenv-expand": "^5.1.0",
                 "ecashaddrjs": "^1.0.1",
+                "ecies-lite": "^1.0.7",
                 "ethereum-blockies-base64": "^1.0.2",
                 "localforage": "^1.9.0",
                 "lodash.isempty": "^4.4.0",
@@ -33,7 +34,8 @@
                 "react-image": "^4.0.3",
                 "react-router": "^5.2.0",
                 "react-router-dom": "^5.2.0",
-                "styled-components": "^4.4.0"
+                "styled-components": "^4.4.0",
+                "wif": "^2.0.6"
             },
             "devDependencies": {
                 "@ant-design/dark-theme": "^1.0.3",
@@ -8135,6 +8137,11 @@
                 "safer-buffer": "^2.1.0"
             }
         },
+        "node_modules/ecies-lite": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/ecies-lite/-/ecies-lite-1.0.7.tgz",
+            "integrity": "sha512-FcT30ao9Crn8LoKw4x/ekp85KddxsNrYp4jxoxfX6RdBG9rEAL/pNK5sJ4j9x1Z22ooA8cILj+iD9bVdMc9opw=="
+        },
         "node_modules/ecurve": {
             "version": "1.0.6",
             "license": "MIT",
@@ -28060,7 +28067,8 @@
         },
         "node_modules/wif": {
             "version": "2.0.6",
-            "license": "MIT",
+            "resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz",
+            "integrity": "sha1-CNP1IFbGZnkplyb63g1DKudLRwQ=",
             "dependencies": {
                 "bs58check": "<3.0.0"
             }
@@ -34210,6 +34218,11 @@
                 "safer-buffer": "^2.1.0"
             }
         },
+        "ecies-lite": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/ecies-lite/-/ecies-lite-1.0.7.tgz",
+            "integrity": "sha512-FcT30ao9Crn8LoKw4x/ekp85KddxsNrYp4jxoxfX6RdBG9rEAL/pNK5sJ4j9x1Z22ooA8cILj+iD9bVdMc9opw=="
+        },
         "ecurve": {
             "version": "1.0.6",
             "requires": {
@@ -47634,6 +47647,8 @@
         },
         "wif": {
             "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz",
+            "integrity": "sha1-CNP1IFbGZnkplyb63g1DKudLRwQ=",
             "requires": {
                 "bs58check": "<3.0.0"
             }
diff --git a/web/cashtab/package.json b/web/cashtab/package.json
--- a/web/cashtab/package.json
+++ b/web/cashtab/package.json
@@ -12,6 +12,7 @@
         "dotenv": "^8.2.0",
         "dotenv-expand": "^5.1.0",
         "ecashaddrjs": "^1.0.1",
+        "ecies-lite": "^1.0.7",
         "ethereum-blockies-base64": "^1.0.2",
         "localforage": "^1.9.0",
         "lodash.isempty": "^4.4.0",
@@ -29,7 +30,8 @@
         "react-image": "^4.0.3",
         "react-router": "^5.2.0",
         "react-router-dom": "^5.2.0",
-        "styled-components": "^4.4.0"
+        "styled-components": "^4.4.0",
+        "wif": "^2.0.6"
     },
     "lint-staged": {
         "src/**/*.{js,jsx,ts,tsx,json,css,scss,md}": [
diff --git a/web/cashtab/src/components/Common/Ticker.js b/web/cashtab/src/components/Common/Ticker.js
--- a/web/cashtab/src/components/Common/Ticker.js
+++ b/web/cashtab/src/components/Common/Ticker.js
@@ -36,7 +36,9 @@
         appPrefixesHex: {
             eToken: '534c5000',
             cashtab: '00746162',
+            cashtabEncrypted: '65746162',
         },
+        encryptedMsgCharLimit: 94,
     },
     settingsValidation: {
         fiatCurrency: [
@@ -142,6 +144,12 @@
         ) {
             // add the extracted Cashtab prefix to array
             resultArray[i] = currency.opReturn.appPrefixesHex.cashtab;
+        } else if (
+            i === 0 &&
+            message === currency.opReturn.appPrefixesHex.cashtabEncrypted
+        ) {
+            // add the Cashtab encryption prefix to array
+            resultArray[i] = currency.opReturn.appPrefixesHex.cashtabEncrypted;
         } else {
             // this is either an external message or a subsequent cashtab message loop to extract the message
             resultArray[i] = message;
diff --git a/web/cashtab/src/components/Send/Send.js b/web/cashtab/src/components/Send/Send.js
--- a/web/cashtab/src/components/Send/Send.js
+++ b/web/cashtab/src/components/Send/Send.js
@@ -12,7 +12,7 @@
 import { Form, message, Modal, Alert, Collapse, Input, Button } from 'antd';
 const { Panel } = Collapse;
 const { TextArea } = Input;
-import { Row, Col } from 'antd';
+import { Row, Col, Switch } from 'antd';
 import PrimaryButton, {
     SecondaryButton,
     SmartButton,
@@ -90,6 +90,10 @@
     const [msgToSign, setMsgToSign] = useState('');
     const [signMessageIsValid, setSignMessageIsValid] = useState(null);
     const [isOneToManyXECSend, setIsOneToManyXECSend] = useState(false);
+    const [opReturnMsg, setOpReturnMsg] = useState(false);
+    const [isEncryptedMsg, setIsEncryptedMsg] = useState(false);
+    const [bchObj, setBchObj] = useState(false);
+
     // Get device window width
     // If this is less than 769, the page will open with QR scanner open
     const { width } = useWindowDimensions();
@@ -140,9 +144,6 @@
 
     const { getBCH, getRestUrl, sendXec, calcFee, signPkMessage } = useBCH();
 
-    // jestBCH is only ever specified for unit tests, otherwise app will use getBCH();
-    const BCH = jestBCH ? jestBCH : getBCH();
-
     // If the balance has changed, unlock the UI
     // This is redundant, if backend has refreshed in 1.75s timeout below, UI will already be unlocked
     useEffect(() => {
@@ -150,6 +151,12 @@
     }, [balances.totalBalance]);
 
     useEffect(() => {
+        // jestBCH is only ever specified for unit tests, otherwise app will use getBCH();
+        const BCH = jestBCH ? jestBCH : getBCH();
+
+        // set the BCH instance to state, for other functions to reference
+        setBchObj(BCH);
+
         // Manually parse for txInfo object on page load when Send.js is loaded with a query string
 
         // if this was routed from Wallet screen's Reply to message link then prepopulate the address and value field
@@ -231,8 +238,6 @@
             dirty: false,
         });
 
-        let optionalOpReturnMsg = formData.opReturnMsg;
-
         if (isOneToManyXECSend) {
             // this is a one to many XEC send transactions
 
@@ -257,11 +262,11 @@
                     toLegacyArray(addressAndValueArray);
 
                 const link = await sendXec(
-                    BCH,
+                    bchObj,
                     wallet,
                     slpBalancesAndUtxos.nonSlpUtxos,
                     currency.defaultFee,
-                    optionalOpReturnMsg,
+                    opReturnMsg,
                     true, // indicate send mode is one to many
                     cleanAddressAndValueArray,
                 );
@@ -324,17 +329,29 @@
                 bchValue = fiatToCrypto(value, fiatPrice);
             }
 
+            // encrypted message limit truncation
+            let encryptedOpReturnMsg;
+            if (isEncryptedMsg) {
+                encryptedOpReturnMsg = opReturnMsg.substring(
+                    0,
+                    currency.opReturn.encryptedMsgCharLimit,
+                );
+            } else {
+                encryptedOpReturnMsg = opReturnMsg;
+            }
+
             try {
                 const link = await sendXec(
-                    BCH,
+                    bchObj,
                     wallet,
                     slpBalancesAndUtxos.nonSlpUtxos,
                     currency.defaultFee,
-                    optionalOpReturnMsg,
+                    encryptedOpReturnMsg,
                     false, // sendToMany boolean flag
                     null, // address array not applicable for one to many tx
                     cleanAddress,
                     bchValue,
+                    isEncryptedMsg,
                 );
                 sendXecNotification(link);
                 clearInputForms();
@@ -350,7 +367,7 @@
         let addressString = value;
 
         // parse address
-        const addressInfo = parseAddress(BCH, addressString);
+        const addressInfo = parseAddress(bchObj, addressString);
         /*
         Model
 
@@ -428,7 +445,7 @@
             let addressString = addressStringArray[i].split(',')[0];
             let valueString = addressStringArray[i].split(',')[1];
 
-            let addressInfo = parseAddress(BCH, addressString);
+            let addressInfo = parseAddress(bchObj, addressString);
 
             let validation = isValidSendToMany(
                 addressInfo,
@@ -468,15 +485,6 @@
         }));
     };
 
-    const handleOpReturnMsgChange = e => {
-        const { value, name } = e.target;
-
-        setFormData(p => ({
-            ...p,
-            [name]: value,
-        }));
-    };
-
     // true: renders the multi recipient <TextArea>
     // false: renders the single recipient <Input>
     const handleOneToManyXECSend = sendXecMode => {
@@ -514,7 +522,7 @@
     const signMessageByPk = async () => {
         try {
             const messageSignature = await signPkMessage(
-                BCH,
+                bchObj,
                 wallet.Path1899.fundingWif,
                 msgToSign,
             );
@@ -545,7 +553,7 @@
         // Set currency to BCH
         setSelectedCurrency(currency.ticker);
         try {
-            const txFeeSats = calcFee(BCH, slpBalancesAndUtxos.nonSlpUtxos);
+            const txFeeSats = calcFee(bchObj, slpBalancesAndUtxos.nonSlpUtxos);
 
             const txFeeBch = txFeeSats / 10 ** currency.cashDecimals;
             let value =
@@ -785,16 +793,69 @@
                                             marginBottom: '20px',
                                         }}
                                     >
-                                        <TextAreaLabel>Message:</TextAreaLabel>
+                                        <TextAreaLabel>
+                                            Message:&nbsp;&nbsp;
+                                            {!isOneToManyXECSend ? (
+                                                <Switch
+                                                    checkedChildren="Private"
+                                                    unCheckedChildren="Public"
+                                                    defaultunchecked="true"
+                                                    checked={isEncryptedMsg}
+                                                    onChange={() =>
+                                                        setIsEncryptedMsg(
+                                                            prev => !prev,
+                                                        )
+                                                    }
+                                                    style={{
+                                                        marginBottom: '7px',
+                                                    }}
+                                                />
+                                            ) : (
+                                                ''
+                                            )}
+                                        </TextAreaLabel>
+                                        {isEncryptedMsg ? (
+                                            <Alert
+                                                style={{
+                                                    marginBottom: '12px',
+                                                    marginTop: '12px',
+                                                }}
+                                                description="Please note encrypted messages can only be sent to wallets with at least 1 outgoing transaction."
+                                                type="warning"
+                                                showIcon
+                                            />
+                                        ) : (
+                                            ''
+                                        )}
                                         <TextArea
                                             name="opReturnMsg"
-                                            placeholder="(max 160 characters)"
-                                            value={formData.opReturnMsg}
+                                            placeholder={
+                                                isEncryptedMsg
+                                                    ? '(max 94 characters)'
+                                                    : '(max 160 characters)'
+                                            }
+                                            value={
+                                                opReturnMsg
+                                                    ? isEncryptedMsg
+                                                        ? opReturnMsg.substring(
+                                                              0,
+                                                              currency.opReturn
+                                                                  .encryptedMsgCharLimit +
+                                                                  1,
+                                                          )
+                                                        : opReturnMsg
+                                                    : ''
+                                            }
                                             onChange={e =>
-                                                handleOpReturnMsgChange(e)
+                                                setOpReturnMsg(e.target.value)
                                             }
                                             showCount
-                                            maxLength={160}
+                                            maxLength={
+                                                isEncryptedMsg
+                                                    ? currency.opReturn
+                                                          .encryptedMsgCharLimit
+                                                    : 160
+                                            }
                                             onKeyDown={e =>
                                                 e.keyCode == 13
                                                     ? e.preventDefault()
diff --git a/web/cashtab/src/components/Wallet/Tx.js b/web/cashtab/src/components/Wallet/Tx.js
--- a/web/cashtab/src/components/Wallet/Tx.js
+++ b/web/cashtab/src/components/Wallet/Tx.js
@@ -41,6 +41,15 @@
     word-break: break-word;
     padding-left: 13px;
     padding-right: 30px;
+    /* invisible scrollbar */
+    overflow: hidden;
+    height: 100%;
+    margin-right: -50px; /* Maximum width of scrollbar */
+    padding-right: 50px; /* Maximum width of scrollbar */
+    overflow-y: scroll;
+    ::-webkit-scrollbar {
+        display: none;
+    }
 `;
 const SentLabel = styled.span`
     font-weight: bold;
@@ -56,6 +65,12 @@
     color: ${props => props.theme.primary} !important;
     white-space: nowrap;
 `;
+const EncryptionMessageLabel = styled.span`
+    text-align: left;
+    font-weight: bold;
+    color: red;
+    white-space: nowrap;
+`;
 const MessageLabel = styled.span`
     text-align: left;
     font-weight: bold;
@@ -403,6 +418,13 @@
                                         External Message
                                     </MessageLabel>
                                 )}
+                                {data.isEncryptedMessage ? (
+                                    <EncryptionMessageLabel>
+                                        &nbsp;-&nbsp;Encrypted
+                                    </EncryptionMessageLabel>
+                                ) : (
+                                    ''
+                                )}
                                 <br />
                                 {data.opReturnMessage
                                     ? Buffer.from(
diff --git a/web/cashtab/src/components/Wallet/__tests__/__snapshots__/Wallet.test.js.snap b/web/cashtab/src/components/Wallet/__tests__/__snapshots__/Wallet.test.js.snap
--- a/web/cashtab/src/components/Wallet/__tests__/__snapshots__/Wallet.test.js.snap
+++ b/web/cashtab/src/components/Wallet/__tests__/__snapshots__/Wallet.test.js.snap
@@ -3,7 +3,7 @@
 exports[`Wallet with BCH balances 1`] = `
 Array [
   <div
-    className="sc-fMiknA fHWQKC"
+    className="sc-dVhcbM fSFzLu"
   >
     <span
       aria-label="party emoji"
@@ -29,7 +29,7 @@
      to send to others
   </div>,
   <div
-    className="sc-jhAzac jLDVSr"
+    className="sc-fBuWsC ouBcJ"
   >
     0
      
@@ -119,16 +119,16 @@
     </div>
   </div>,
   <div
-    className="sc-TOsTZ ihWfGS"
+    className="sc-kgAjT jByKrU"
   >
     <div
-      className="sc-kgAjT kbUjME"
+      className="sc-cJSrbW fxyvyQ"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-kgAjT kbUjME nonactiveBtn"
+      className="sc-cJSrbW fxyvyQ nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -140,7 +140,7 @@
 exports[`Wallet with BCH balances and tokens 1`] = `
 Array [
   <div
-    className="sc-fMiknA fHWQKC"
+    className="sc-dVhcbM fSFzLu"
   >
     <span
       aria-label="party emoji"
@@ -166,7 +166,7 @@
      to send to others
   </div>,
   <div
-    className="sc-jhAzac jLDVSr"
+    className="sc-fBuWsC ouBcJ"
   >
     0
      
@@ -256,16 +256,16 @@
     </div>
   </div>,
   <div
-    className="sc-TOsTZ ihWfGS"
+    className="sc-kgAjT jByKrU"
   >
     <div
-      className="sc-kgAjT kbUjME"
+      className="sc-cJSrbW fxyvyQ"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-kgAjT kbUjME nonactiveBtn"
+      className="sc-cJSrbW fxyvyQ nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -277,14 +277,14 @@
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 Array [
   <div
-    className="sc-jhAzac jLDVSr"
+    className="sc-fBuWsC ouBcJ"
   >
     0.06
      
     XEC
   </div>,
   <div
-    className="sc-fBuWsC cWYAdq"
+    className="sc-fMiknA fexmhZ"
   >
     $ 
     NaN
@@ -375,16 +375,16 @@
     </div>
   </div>,
   <div
-    className="sc-TOsTZ ihWfGS"
+    className="sc-kgAjT jByKrU"
   >
     <div
-      className="sc-kgAjT kbUjME"
+      className="sc-cJSrbW fxyvyQ"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-kgAjT kbUjME nonactiveBtn"
+      className="sc-cJSrbW fxyvyQ nonactiveBtn"
       onClick={[Function]}
     >
       eToken
@@ -396,7 +396,7 @@
 exports[`Wallet without BCH balance 1`] = `
 Array [
   <div
-    className="sc-fMiknA fHWQKC"
+    className="sc-dVhcbM fSFzLu"
   >
     <span
       aria-label="party emoji"
@@ -422,7 +422,7 @@
      to send to others
   </div>,
   <div
-    className="sc-jhAzac jLDVSr"
+    className="sc-fBuWsC ouBcJ"
   >
     0
      
@@ -512,16 +512,16 @@
     </div>
   </div>,
   <div
-    className="sc-TOsTZ ihWfGS"
+    className="sc-kgAjT jByKrU"
   >
     <div
-      className="sc-kgAjT kbUjME"
+      className="sc-cJSrbW fxyvyQ"
       onClick={[Function]}
     >
       XEC
     </div>
     <div
-      className="sc-kgAjT kbUjME nonactiveBtn"
+      className="sc-cJSrbW fxyvyQ nonactiveBtn"
       onClick={[Function]}
     >
       eToken
diff --git a/web/cashtab/src/hooks/__mocks__/mockParsedTxs.js b/web/cashtab/src/hooks/__mocks__/mockParsedTxs.js
--- a/web/cashtab/src/hooks/__mocks__/mockParsedTxs.js
+++ b/web/cashtab/src/hooks/__mocks__/mockParsedTxs.js
@@ -10,6 +10,7 @@
         height: 674993,
         outgoingTx: true,
         isCashtabMessage: false,
+        isEncryptedMessage: false,
         opReturnMessage: '',
         replyAddress: null,
         tokenTx: false,
@@ -28,6 +29,7 @@
         height: 672077,
         outgoingTx: false,
         isCashtabMessage: false,
+        isEncryptedMessage: false,
         opReturnMessage: '',
         replyAddress: null,
         tokenTx: false,
@@ -46,6 +48,7 @@
         height: 674444,
         outgoingTx: true,
         isCashtabMessage: false,
+        isEncryptedMessage: false,
         opReturnMessage: '',
         replyAddress: null,
         tokenTx: true,
@@ -63,6 +66,7 @@
         height: 674143,
         outgoingTx: false,
         isCashtabMessage: false,
+        isEncryptedMessage: false,
         opReturnMessage: '',
         replyAddress: null,
         tokenTx: true,
@@ -82,6 +86,7 @@
         outgoingTx: false,
         tokenTx: false,
         isCashtabMessage: false,
+        isEncryptedMessage: false,
         txid: 'dd35690b0cefd24dcc08acba8694ecd49293f365a81372cb66c8f1c1291d97c5',
     },
 ];
@@ -98,6 +103,7 @@
         outgoingTx: false,
         tokenTx: false,
         isCashtabMessage: true,
+        isEncryptedMessage: false,
         txid: '5adc33b5c0509b31c6da359177b19467c443bdc4dd37c283c0f87244c0ad63af',
     },
 ];
diff --git a/web/cashtab/src/hooks/useBCH.js b/web/cashtab/src/hooks/useBCH.js
--- a/web/cashtab/src/hooks/useBCH.js
+++ b/web/cashtab/src/hooks/useBCH.js
@@ -10,8 +10,12 @@
     isValidStoredWallet,
     checkNullUtxosForTokenStatus,
     confirmNonEtokenUtxos,
+    convertToEncryptStruct,
+    getPublicKey,
 } from '@utils/cashMethods';
 import cashaddr from 'ecashaddrjs';
+import ecies from 'ecies-lite';
+import wif from 'wif';
 
 export default function useBCH() {
     const SEND_BCH_ERRORS = {
@@ -72,7 +76,7 @@
         return flatTxHistory.splice(0, txCount);
     };
 
-    const parseTxData = async (BCH, txData, publicKeys) => {
+    const parseTxData = async (BCH, txData, publicKeys, wallet) => {
         /*
         Desired output
         [
@@ -117,6 +121,7 @@
             let amountReceived = 0;
             let opReturnMessage = '';
             let isCashtabMessage = false;
+            let isEncryptedMessage = false;
             // Assume an incoming transaction
             let outgoingTx = false;
             let tokenTx = false;
@@ -198,6 +203,55 @@
                                     parsedOpReturnArray[1],
                             );
                         }
+                    } else if (
+                        txType ===
+                        currency.opReturn.appPrefixesHex.cashtabEncrypted
+                    ) {
+                        // this is an encrypted Cashtab message
+                        let msgString = parsedOpReturnArray[1];
+                        let fundingWif, privateKeyObj, privateKeyBuff;
+                        if (
+                            wallet &&
+                            wallet.state &&
+                            wallet.state.slpBalancesAndUtxos &&
+                            wallet.state.slpBalancesAndUtxos.nonSlpUtxos[0]
+                        ) {
+                            fundingWif =
+                                wallet.state.slpBalancesAndUtxos.nonSlpUtxos[0]
+                                    .wif;
+                            privateKeyObj = wif.decode(fundingWif);
+                            privateKeyBuff = privateKeyObj.privateKey;
+                            if (!privateKeyBuff) {
+                                throw new Error('Private key extraction error');
+                            }
+                        } else {
+                            break;
+                        }
+
+                        let structData;
+                        let decryptedMessage;
+
+                        try {
+                            // Convert the hex encoded message to a buffer
+                            const msgBuf = Buffer.from(msgString, 'hex');
+
+                            // Convert the bufer into a structured object.
+                            structData = convertToEncryptStruct(msgBuf);
+                            decryptedMessage = await ecies.decrypt(
+                                privateKeyBuff,
+                                structData,
+                            );
+                        } catch (err) {
+                            console.log(
+                                'useBCH.parsedTxData() decryption error: ' +
+                                    err,
+                            );
+                            decryptedMessage =
+                                'Only the message recipient can view this';
+                        }
+                        isCashtabMessage = true;
+                        isEncryptedMessage = true;
+                        opReturnMessage = decryptedMessage;
                     } else {
                         // this is an externally generated message
                         message = txType; // index 0 is the message content in this instance
@@ -270,6 +324,7 @@
             parsedTx.destinationAddress = destinationAddress;
             parsedTx.opReturnMessage = opReturnMessage;
             parsedTx.isCashtabMessage = isCashtabMessage;
+            parsedTx.isEncryptedMessage = isEncryptedMessage;
             parsedTxHistory.push(parsedTx);
         }
         return parsedTxHistory;
@@ -318,7 +373,7 @@
         return txDataWithPassThrough;
     };
 
-    const getTxData = async (BCH, txHistory, publicKeys) => {
+    const getTxData = async (BCH, txHistory, publicKeys, wallet) => {
         // Flatten tx history
         let flatTxs = flattenTransactions(txHistory);
 
@@ -337,7 +392,12 @@
         try {
             txDataPromiseResponse = await Promise.all(txDataPromises);
 
-            const parsed = parseTxData(BCH, txDataPromiseResponse, publicKeys);
+            const parsed = parseTxData(
+                BCH,
+                txDataPromiseResponse,
+                publicKeys,
+                wallet,
+            );
 
             return parsed;
         } catch (err) {
@@ -1064,6 +1124,7 @@
         destinationAddressAndValueArray,
         destinationAddress,
         sendAmount,
+        encryptionFlag,
     ) => {
         try {
             let value = new BigNumber(0);
@@ -1143,20 +1204,63 @@
                 throw error;
             }
 
+            let script;
             // Start of building the OP_RETURN output.
             // only build the OP_RETURN output if the user supplied it
             if (
+                optionalOpReturnMsg &&
                 typeof optionalOpReturnMsg !== 'undefined' &&
                 optionalOpReturnMsg.trim() !== ''
             ) {
-                const script = [
-                    BCH.Script.opcodes.OP_RETURN, // 6a
-                    Buffer.from(
-                        currency.opReturn.appPrefixesHex.cashtab,
-                        'hex',
-                    ), // 00746162
-                    Buffer.from(optionalOpReturnMsg),
-                ];
+                if (encryptionFlag) {
+                    // if the user has opted to encrypt this message
+                    let recipientPubKey = await getPublicKey(
+                        BCH,
+                        destinationAddress,
+                    );
+
+                    if (recipientPubKey === 'not found') {
+                        // if the API can't find a pub key, it is due to the wallet having no outbound tx
+                        throw new Error(
+                            'No outgoing transactions found in the recipient address',
+                        );
+                    }
+
+                    const pubKeyBuf = Buffer.from(recipientPubKey, 'hex');
+                    const bufferedFile = Buffer.from(optionalOpReturnMsg);
+                    const structuredEj = await ecies.encrypt(
+                        pubKeyBuf,
+                        bufferedFile,
+                    );
+
+                    // Serialize the encrypted data object
+                    const encryptedEj = Buffer.concat([
+                        structuredEj.epk,
+                        structuredEj.iv,
+                        structuredEj.ct,
+                        structuredEj.mac,
+                    ]);
+
+                    // build the OP_RETURN script with the encryption prefix
+                    script = [
+                        BCH.Script.opcodes.OP_RETURN, // 6a
+                        Buffer.from(
+                            currency.opReturn.appPrefixesHex.cashtabEncrypted,
+                            'hex',
+                        ), // 65746162
+                        Buffer.from(encryptedEj),
+                    ];
+                } else {
+                    // this is an en-encrypted message
+                    script = [
+                        BCH.Script.opcodes.OP_RETURN, // 6a
+                        Buffer.from(
+                            currency.opReturn.appPrefixesHex.cashtab,
+                            'hex',
+                        ), // 00746162
+                        Buffer.from(optionalOpReturnMsg),
+                    ];
+                }
                 const data = BCH.Script.encode(script);
                 transactionBuilder.addOutput(data, 0);
             }
diff --git a/web/cashtab/src/hooks/useWallet.js b/web/cashtab/src/hooks/useWallet.js
--- a/web/cashtab/src/hooks/useWallet.js
+++ b/web/cashtab/src/hooks/useWallet.js
@@ -247,7 +247,12 @@
             const txHistory = await getTxHistory(BCH, cashAddresses);
 
             // public keys are used to determined if a tx is incoming outgoing
-            const parsedTxHistory = await getTxData(BCH, txHistory, publicKeys);
+            const parsedTxHistory = await getTxData(
+                BCH,
+                txHistory,
+                publicKeys,
+                wallet,
+            );
 
             const parsedWithTokens = await addTokenTxData(BCH, parsedTxHistory);
 
diff --git a/web/cashtab/src/utils/cashMethods.js b/web/cashtab/src/utils/cashMethods.js
--- a/web/cashtab/src/utils/cashMethods.js
+++ b/web/cashtab/src/utils/cashMethods.js
@@ -258,16 +258,19 @@
                     // then it's an eToken tx that has not been properly validated
                     // Do not include it in nonEtokenUtxos
                     // App will ignore it until SLPDB is able to validate it
+                    /*
                     console.log(
                         `utxo ${thisUtxoTxid} requires further eToken validation, ignoring`,
-                    );
+                    );*/
                 } else {
                     // Otherwise it's just an OP_RETURN tx that SLPDB has some issue with
                     // It should still be in the user's utxo set
                     // Include it in nonEtokenUtxos
+                    /*
                     console.log(
                         `utxo ${thisUtxoTxid} is not an eToken tx, adding to nonSlpUtxos`,
                     );
+                    */
                     nonEtokenUtxos.push(thisUtxoTxid);
                 }
             }
@@ -276,6 +279,54 @@
     return nonEtokenUtxos;
 };
 
+// Converts a serialized buffer containing encrypted data into an object
+// that can be interpreted by the eccryptoJS library.
+export const convertToEncryptStruct = encbuf => {
+    try {
+        let offset = 0;
+        const tagLength = 32;
+        let pub;
+        switch (encbuf[0]) {
+            case 4:
+                pub = encbuf.slice(0, 65);
+                break;
+            case 3:
+            case 2:
+                pub = encbuf.slice(0, 33);
+                break;
+            default:
+                throw new Error(`Invalid type: ${encbuf[0]}`);
+        }
+        offset += pub.length;
+
+        const c = encbuf.slice(offset, encbuf.length - tagLength);
+        const ivbuf = c.slice(0, 128 / 8);
+        const ctbuf = c.slice(128 / 8);
+
+        const d = encbuf.slice(encbuf.length - tagLength, encbuf.length);
+
+        return {
+            iv: ivbuf,
+            epk: pub,
+            ct: ctbuf,
+            mac: d,
+        };
+    } catch (err) {
+        console.error(`useBCH.convertToEncryptStruct() error: `, err);
+        throw err;
+    }
+};
+
+export const getPublicKey = async (BCH, address) => {
+    try {
+        const publicKey = await BCH.encryption.getPubKey(address);
+        return publicKey.publicKey;
+    } catch (err) {
+        console.log(`useBCH.getPublicKey() error: `, err);
+        throw err;
+    }
+};
+
 export const isLegacyMigrationRequired = wallet => {
     // If the wallet does not have Path1899,
     // Or each Path1899, Path145, Path245 does not have a public key