diff --git a/src/components/NewNote/EditBox/EditBox.tsx b/src/components/NewNote/EditBox/EditBox.tsx
index 3732c1e..a39df61 100644
--- a/src/components/NewNote/EditBox/EditBox.tsx
+++ b/src/components/NewNote/EditBox/EditBox.tsx
@@ -623,9 +623,9 @@ const EditBox: Component<{
 
     if (account) {
       let tags = referencesToTags(messageToSend);
+      const rep = props.replyToNote;
 
-      if (props.replyToNote) {
-        const rep = props.replyToNote;
+      if (rep) {
         const rootTag = rep.post.tags.find(t => t[0] === 'e' && t[3] === 'root');
 
         // If the note has a root tag, that meens it is not a root note itself
@@ -664,7 +664,7 @@ const EditBox: Component<{
               toast?.sendSuccess(intl.formatMessage(tToast.publishNoteSuccess));
               props.onSuccess && props.onSuccess({ success, reasons, note });
               setIsPostingInProgress(false);
-              saveNoteDraft(account.publicKey, '', props.replyToNote?.post.id)
+              saveNoteDraft(account.publicKey, '', rep?.post.noteId)
               clearEditor();
             }
             unsub();
diff --git a/src/components/Note/Note.module.scss b/src/components/Note/Note.module.scss
index 21004a8..2ed4470 100644
--- a/src/components/Note/Note.module.scss
+++ b/src/components/Note/Note.module.scss
@@ -75,7 +75,7 @@
         font-weight: 400;
         line-height: 20px;
         margin-top: 4px;
-        margin-bottom: 16px;
+        margin-bottom: 12px;
         width: 100%;
         overflow: hidden;
       }
diff --git a/src/components/Note/NotePrimary/NotePrimary.module.scss b/src/components/Note/NotePrimary/NotePrimary.module.scss
index f5bfad2..0e4ea73 100644
--- a/src/components/Note/NotePrimary/NotePrimary.module.scss
+++ b/src/components/Note/NotePrimary/NotePrimary.module.scss
@@ -25,7 +25,7 @@
       font-weight: 400;
       line-height: 24px;
       width: 100%;
-      margin-bottom: 17px;
+      margin-bottom: 12px;
 
       a:hover {
         text-decoration: underline;