diff --git a/.gitignore b/.gitignore
index e829503a4..be37bb1b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ builder.yml
 !tests/_support/.gitkeep
 tests/_support/*
 .php_cs.cache
+.sass-cache/*
diff --git a/composer.json b/composer.json
index 2ed3529a1..dd3b0f042 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         }
     ],
     "dist": {
-        "url": "https://github.com/publishpress/PublishPress/releases/download/v3.4.1/publishpress-3.4.1.zip",
+        "url": "https://github.com/publishpress/PublishPress/releases/download/v3.5.0/publishpress-3.5.0.zip",
         "type": "zip"
     },
     "require": {
diff --git a/includes.php b/includes.php
index d1b4456a7..14bc1f442 100644
--- a/includes.php
+++ b/includes.php
@@ -33,7 +33,7 @@
 
 if (!defined('PP_LOADED')) {
     // Define constants
-    define('PUBLISHPRESS_VERSION', '3.4.1');
+    define('PUBLISHPRESS_VERSION', '3.5.0');
     define('PUBLISHPRESS_BASE_PATH', __DIR__);
     define('PUBLISHPRESS_FILE_PATH', PUBLISHPRESS_BASE_PATH . '/publishpress.php');
     define('PUBLISHPRESS_LIBRARIES_PATH', PUBLISHPRESS_BASE_PATH . '/libraries');
diff --git a/modules/calendar/lib/async-calendar/styles/async-calendar.css b/modules/calendar/lib/async-calendar/styles/async-calendar.css
index 00ba7a99b..5cb545ee8 100644
--- a/modules/calendar/lib/async-calendar/styles/async-calendar.css
+++ b/modules/calendar/lib/async-calendar/styles/async-calendar.css
@@ -151,6 +151,12 @@
 .publishpress-calendar-popup table th {
   font-weight: bold;
 }
+.publishpress-calendar-popup table td {
+  word-wrap: break-word;
+  word-break: break-word;
+  white-space: normal;
+  padding-right: 35px;
+}
 .publishpress-calendar-popup .publishpress-calendar-popup-title {
   font-weight: bold;
   width: 100%;
diff --git a/modules/calendar/lib/async-calendar/styles/async-calendar.css.map b/modules/calendar/lib/async-calendar/styles/async-calendar.css.map
index b0b7287bd..37e12dfd4 100644
--- a/modules/calendar/lib/async-calendar/styles/async-calendar.css.map
+++ b/modules/calendar/lib/async-calendar/styles/async-calendar.css.map
@@ -1 +1 @@
-{"version":3,"sources":["loader.less","spinner.less","popup.less","async-calendar.less"],"names":[],"mappings":"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","file":"async-calendar.css"}
\ No newline at end of file
+{"version":3,"sources":["loader.less","spinner.less","popup.less","async-calendar.less"],"names":[],"mappings":"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","file":"async-calendar.css"}
\ No newline at end of file
diff --git a/modules/calendar/lib/async-calendar/styles/popup.less b/modules/calendar/lib/async-calendar/styles/popup.less
index 662d06e76..103b0a589 100644
--- a/modules/calendar/lib/async-calendar/styles/popup.less
+++ b/modules/calendar/lib/async-calendar/styles/popup.less
@@ -47,6 +47,13 @@
         th {
             font-weight: bold;
         }
+
+        td {
+            word-wrap: break-word;
+            word-break: break-word;
+            white-space: normal;
+            padding-right: 35px;
+        }
     }
 
     .publishpress-calendar-popup-title {
diff --git a/modules/editorial-comments/editorial-comments.php b/modules/editorial-comments/editorial-comments.php
index d6dcc6e4f..8e117bf9e 100644
--- a/modules/editorial-comments/editorial-comments.php
+++ b/modules/editorial-comments/editorial-comments.php
@@ -88,6 +88,8 @@ public function init()
             add_action('admin_init', [$this, 'register_settings']);
             add_action('admin_enqueue_scripts', [$this, 'add_admin_scripts']);
             add_action('wp_ajax_publishpress_ajax_insert_comment', [$this, 'ajax_insert_comment']);
+            add_action('wp_ajax_publishpress_ajax_edit_comment', [$this, 'ajax_edit_comment']);
+            add_action('wp_ajax_publishpress_ajax_delete_comment', [$this, 'ajax_delete_comment']);
 
             // Add Editorial Comments to the calendar if the calendar is activated
             if ($this->module_enabled('calendar')) {
@@ -148,6 +150,14 @@ public function add_admin_scripts()
                 'all'
             );
 
+            wp_localize_script(
+                'publishpress-editorial-comments',
+                'publishpressEditorialCommentsParams',
+                [
+                    'loadingImgSrc' => esc_url(admin_url('/images/wpspin_light.gif')),
+                ]
+            );
+
             $thread_comments = (int)get_option('thread_comments'); ?>
             <script type="text/javascript">
                 var pp_thread_comments = <?php echo ($thread_comments) ? esc_html__($thread_comments) : 0; ?>;
@@ -270,7 +280,7 @@ class="button hide-if-no-js" title=" <?php _e(
                     <textarea id="pp-replycontent" name="replycontent" cols="40" rows="5"></textarea>
                 </div>
 
-                <p id="pp-replysubmit">
+                <div id="pp-replysubmit">
                     <a class="button pp-replysave button-primary alignright" href="#comments-form">
                         <span id="pp-replybtn"><?php _e('Add Comment', 'publishpress') ?></span>
                     </a>
@@ -280,7 +290,7 @@ class="button hide-if-no-js" title=" <?php _e(
                          class="alignright" style="display: none;" id="pp-comment_loading"/>
                     <br class="clear" style="margin-bottom:35px;"/>
                     <span style="display: none;" class="error"></span>
-                </p>
+                </div>
 
                 <input type="hidden" value="" id="pp-comment_parent" name="pp-comment_parent"/>
                 <input type="hidden" name="pp-post_id" id="pp-post_id" value="<?php echo esc_attr($post->ID); ?>"/>
@@ -298,21 +308,16 @@ class="alignright" style="display: none;" id="pp-comment_loading"/>
          */
         public function the_comment($theComment, $args, $depth)
         {
-            global $current_user, $userdata, $comment;
+            global $comment;
 
             // Get current user
-            wp_get_current_user();
+            $user = wp_get_current_user();
 
             // Update the global var for the comment.
             // phpcs:disable WordPress.WP.GlobalVariablesOverride.Prohibited
             $comment = $theComment;
             // phpcs:enable
 
-            // Deleting editorial comments is not enabled for now for the sake of transparency. However, we could consider
-            // EF comment edits (with history, if possible). P2 already allows for edits without history, so even that might work.
-            // Pivotal ticket: https://www.pivotaltracker.com/story/show/18483757
-            //$delete_url = esc_url(wp_nonce_url("comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID"));
-
             $actions = [];
 
             $actions_string_escaped = '';
@@ -323,24 +328,51 @@ public function the_comment($theComment, $args, $depth)
                         'publishpress'
                     ) . '" href="#">' . esc_html__('Reply', 'publishpress') . '</a>';
 
+                if (
+                    ($user->user_nicename == $theComment->comment_author && current_user_can('pp_edit_editorial_comment')
+                        || current_user_can('pp_edit_others_editorial_comment')
+                    )
+                ) {
+                    $actions['quickedit'] = '<a onclick="editorialCommentEdit.open(\'' . (int)$theComment->comment_ID . '\');" href="javascript:void(0);">' . esc_html__(
+                            'Edit',
+                            'publishpress'
+                        ) . '</a>';
+                }
+
+                if (
+                    ($user->ID === $theComment->author && current_user_can('pp_delete_editorial_comment')
+                        || current_user_can('pp_delete_others_editorial_comment')
+                    )
+                ) {
+                    $actions['delete'] = '<a onclick="editorialCommentDelete.open(\'' . (int)$theComment->comment_ID . '\');" href="javascript:void(0);">' . esc_html__(
+                            'Delete',
+                            'publishpress'
+                        ) . '</a>';
+                }
+
                 $i = 0;
                 foreach ($actions as $action => $link) {
                     ++$i;
-                    // Reply and quickedit need a hide-if-no-js span
-                    if ('reply' == $action || 'quickedit' == $action) {
-                        $action .= ' hide-if-no-js';
+
+                    if ($i > 1) {
+                        $actions_string_escaped .= ' | ';
                     }
 
+                    $action .= ' hide-if-no-js';
+
                     $actions_string_escaped .= "&nbsp;<span class='". esc_attr($action) . "'>$link</span>";
                 }
-            } ?>
+            }
+
+            ?>
 
             <li id="comment-<?php echo esc_attr($theComment->comment_ID); ?>" <?php comment_class(
                 [
                     'comment-item',
                     wp_get_comment_status($theComment->comment_ID),
                 ]
-            ); ?>>
+            ); ?> data-parent="<?php echo $theComment->comment_parent; ?>" data-id="<?php echo $theComment->comment_ID; ?>" data-post-id="<?php echo $theComment->comment_post_ID; ?>">
+
 
                 <?php echo get_avatar($theComment->comment_author_email, 50); ?>
 
@@ -357,10 +389,7 @@ public function the_comment($theComment, $args, $depth)
                     </h5>
 
                     <div class="comment-content"><?php comment_text(); ?></div>
-                    <?php // phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped ?>
-                    <p class="row-actions"><?php echo $actions_string_escaped; ?></p>
-                    <?php // phpcs:enable ?>
-
+                    <div class="row-actions"><?php echo $actions_string_escaped; ?></div>
                 </div>
             </li>
             <?php
@@ -499,6 +528,235 @@ public function ajax_insert_comment()
             }
         }
 
+        /**
+         * Handles AJAX edit comment
+         */
+        public function ajax_edit_comment()
+        {
+            global $current_user;
+
+            // Verify nonce
+            if (!isset($_POST['_nonce'])
+                || !wp_verify_nonce($_POST['_nonce'], 'comment')
+            ) {
+                wp_die(
+                    esc_html__(
+                        "Nonce check failed. Please ensure you're supposed to be editing editorial comments.",
+                        'publishpress'
+                    ),
+                    '',
+                    ['response' => 403]
+                );
+            }
+
+            if (!isset($_POST['comment_id']) || !isset($_POST['content']) || !isset($_POST['post_id'])) {
+                wp_die(esc_html__('Invalid comment data', 'publishpress'),
+                       '',
+                       ['response' => 400]);
+            }
+
+            wp_get_current_user();
+
+            $comment_id      = absint($_POST['comment_id']);
+            $post_id = absint($_POST['post_id']);
+
+            // Only allow the comment if user can edit post
+            if (!current_user_can('edit_post', $post_id)) {
+                wp_die(
+                    esc_html__(
+                        'Sorry, you don\'t have the privileges to edit editorial comments. Please talk to your Administrator.',
+                        'publishpress'
+                    ),
+                    '',
+                    ['response' => 403]
+                );
+            }
+
+            $theComment = get_comment($comment_id);
+
+            if (
+                !($current_user->user_nicename == $theComment->comment_author && current_user_can('pp_edit_editorial_comment'))
+                && !current_user_can('pp_edit_others_editorial_comment')
+            ) {
+                wp_die(
+                    esc_html__(
+                        'Sorry, you don\'t have the privileges to edit this editorial comment. Please talk to your Administrator.',
+                        'publishpress'
+                    ),
+                    '',
+                    ['response' => 403]
+                );
+            }
+
+            // Verify that comment was actually entered
+            $comment_content = esc_html(trim($_POST['content']));
+            if (!$comment_content) {
+                wp_die(esc_html__("Please enter a comment.", 'publishpress'),
+                       '',
+                       ['response' => 400]);
+            }
+
+            // Check that we have a post_id and user logged in
+            if ($post_id && $comment_id && $current_user) {
+
+                $comment_content = wp_kses(
+                    $comment_content,
+                    [
+                        'a'          => ['href' => [], 'title' => []],
+                        'b'          => [],
+                        'i'          => [],
+                        'strong'     => [],
+                        'em'         => [],
+                        'u'          => [],
+                        'del'        => [],
+                        'blockquote' => [],
+                        'sub'        => [],
+                        'sup'        => [],
+                    ]
+                );
+
+                $data = [
+                    'comment_ID' => (int)$comment_id,
+                    'comment_content' => $comment_content,
+                ];
+
+                $data = apply_filters('pp_pre_edit_editorial_comment', $data);
+
+                $status = wp_update_comment($data);
+
+                if ($status == 1) {
+                    do_action('pp_post_edit_editorial_comment', $comment_id);
+                }
+
+                // Prepare response
+
+                $theComment = get_comment($comment_id);
+
+                $response = [
+                    'id'     => $comment_id,
+                    'content'   => apply_filters('comment_text', $theComment->comment_content, $theComment),
+                    'action' => 'edit',
+                ];
+
+                wp_send_json($response);
+            } else {
+                wp_die(
+                    esc_html__(
+                        'There was a problem of some sort. Try again or contact your administrator.',
+                        'publishpress'
+                    ),
+                '',
+                    ['response' => 403]
+                );
+            }
+        }
+
+        /**
+         * Handles AJAX delete comment
+         */
+        public function ajax_delete_comment()
+        {
+            global $current_user;
+
+            // Verify nonce
+            if (!isset($_POST['_nonce'])
+                || !wp_verify_nonce($_POST['_nonce'], 'comment')
+            ) {
+                wp_die(
+                    esc_html__(
+                        "Nonce check failed. Please ensure you're supposed to be editing editorial comments.",
+                        'publishpress'
+                    ),
+                    '',
+                    ['response' => 403]
+                );
+            }
+
+            if (!isset($_POST['comment_id'])) {
+                wp_die(esc_html__('Invalid comment data', 'publishpress'),
+                       '',
+                       ['response' => 400]);
+            }
+
+            wp_get_current_user();
+
+            $comment_id      = absint($_POST['comment_id']);
+
+            $theComment = get_comment($comment_id);
+
+            // Only allow the comment if user can edit post
+            if (!current_user_can('edit_post', $theComment->comment_post_ID)) {
+                wp_die(
+                    esc_html__(
+                        'Sorry, you don\'t have the privileges to edit editorial comments. Please talk to your Administrator.',
+                        'publishpress'
+                    ),
+                    '',
+                    ['response' => 403]
+                );
+            }
+
+            if (
+                !($current_user->user_nicename == $theComment->comment_author && current_user_can('pp_delete_editorial_comment'))
+                && !current_user_can('pp_delete_others_editorial_comment')
+            ) {
+                wp_die(
+                    esc_html__(
+                        'Sorry, you don\'t have the privileges to delete this editorial comment. Please talk to your Administrator.',
+                        'publishpress'
+                    ),
+                    '',
+                    ['response' => 403]
+                );
+            }
+
+            // Check that we have a post_id and user logged in
+            if ($comment_id && $current_user) {
+                // Check if the comment has any reply and deny the delete action.
+                $replies = get_comments([
+                    'parent' => $comment_id,
+                    'count'  => true,
+                    'type'   => self::comment_type,
+                    'status' => self::comment_type,
+                 ]);
+
+                if (!empty($replies)) {
+                    wp_die(
+                        esc_html__(
+                            'Sorry, you can\'t delete this editorial comment because it has some replies.',
+                            'publishpress'
+                        ),
+                        '',
+                        ['response' => 403]
+                    );
+                }
+
+                do_action('pp_pre_delete_editorial_comment', $comment_id);
+
+                $deleted = wp_trash_comment($comment_id);
+
+                if ($deleted) {
+                    do_action('pp_post_delete_editorial_comment', $comment_id);
+                }
+
+                $response = [
+                    'id'     => $comment_id,
+                    'action' => 'delete',
+                ];
+
+                wp_send_json($response);
+            } else {
+                wp_die(
+                    esc_html__(
+                        'There was a problem of some sort. Try again or contact your administrator.',
+                        'publishpress'
+                    ),
+                    '',
+                    ['response' => 403]
+                );
+            }
+        }
+
         /**
          * Register settings for editorial comments so we can partially use the Settings API
          * (We use the Settings API for form generation, but not saving)
diff --git a/modules/editorial-comments/lib/editorial-comments.css b/modules/editorial-comments/lib/editorial-comments.css
index 0c8396d0c..0ad4ed2df 100644
--- a/modules/editorial-comments/lib/editorial-comments.css
+++ b/modules/editorial-comments/lib/editorial-comments.css
@@ -1,35 +1,29 @@
 /** Comments **/
-
 #pp-comments li:target {
   border: 1px solid #ffd400 !important;
   border-left: 5px solid #ffd400 !important;
   border-right: 5px solid #ffd400 !important;
-  background: #f7eaff;
-}
+  background: #f7eaff; }
 
 #pp-comments li:target:before {
   display: block;
   content: " ";
   margin-top: -75px;
   height: 75px;
-  visibility: hidden;
-}
+  visibility: hidden; }
 
 #pp-comments_wrapper {
-  padding: 0;
-}
+  padding: 0; }
 
 #publishpress-editorial-comments h3 {
   padding-left: 25px;
   background-image: url(editorial_comments_s16.png);
   background-repeat: no-repeat;
-  background-position: 5px 5px;
-}
+  background-position: 5px 5px; }
 
 #pp-comments {
   margin-bottom: 10px;
-  background: #eee;
-}
+  background: #eee; }
 
 #pp-comments li {
   padding: 5px;
@@ -37,27 +31,36 @@
   border-left: 5px solid #e5e5e5;
   border-right: 5px solid #e5e5e5;
   border-bottom: 1px solid #e5e5e5;
-  background: #fff;
-}
+  background: #fff; }
 
-#pp-comments li:hover p.row-actions {
-  visibility: visible;
-}
+#pp-comments li:hover .row-actions {
+  visibility: visible; }
 
-#pp-comments li p.row-actions {
+#pp-comments li .row-actions {
   text-align: right;
-}
+  margin: 4px 0;
+  display: block;
+  width: 100%;
+  height: 20px; }
 
 #pp-comments ul.children {
   margin-left: 30px;
-  margin-bottom: 10px;
-}
+  margin-bottom: 10px; }
 
 #pp-comments ul.children li {
   /*background: #EAF2FA;*/
   border-left: 5px solid #e5e5e5;
-  border-bottom: 1px solid #e5e5e5;
-}
+  border-bottom: 1px solid #e5e5e5; }
+
+#pp-comment_loading {
+  margin-left: 10px; }
+
+#pp-editcontainer .pp-error {
+  width: calc(100% - 70px);
+  margin-left: 70px;
+  padding: 10px;
+  background: #ffdddd;
+  border: 1px solid #f7bebe; }
 
 /*
 #pp-comments .even { background: none; }
@@ -68,109 +71,97 @@
   float: left;
   margin-left: 2px;
   margin-right: 15px;
-  margin-top: 0;
-}
+  margin-top: 0; }
 
 #pp-comments h5 {
   font-style: normal;
   font-size: 1em;
   line-height: 1.1em;
   margin-top: 10px;
-  margin-bottom: 10px;
-}
+  margin-bottom: 10px; }
 
 #pp-comments h5 span.meta {
   color: #666666;
   font-size: 0.85em;
   margin: 0 0 1.5em;
-  font-style: normal;
-}
+  font-style: normal; }
 
 #pp-comments .comment-content {
-  margin-left: 67px;
-}
+  margin-left: 67px; }
 
 #pp-comments .comment-content p {
   color: #555555;
   font-size: 1em;
   line-height: 1.4em;
-  margin: 0.7em 0;
-}
+  margin: 0.7em 0; }
 
 #pp-replyrow #pp-replycontent {
   width: 100%;
-  height: 100px;
-}
+  height: 150px;
+  padding: 5px; }
 
+#pp-editrow #pp-editcontent {
+  box-sizing: border-box;
+  width: calc(100% - 70px);
+  height: 150px;
+  margin-left: 70px;
+  padding: 5px; }
+
+#pp-editrow #pp-editsubmit,
 #pp-replyrow #pp-replysubmit {
-  margin: 6px 0;
-}
+  margin: 6px 0; }
 
+#pp-editrow #pp-editsubmit *,
 #pp-replyrow #pp-replysubmit * {
-  margin-left: 3px;
-}
+  margin-left: 3px; }
 
+#pp-editrow #pp-editsubmit .error,
 #pp-replyrow #pp-replysubmit .error {
   margin: 6px 6px 0 0;
   line-height: 1.2em;
-  padding: 4px 10px;
-}
+  padding: 4px 10px; }
+
+#pp-editrow #pp-editsubmit {
+  width: 100%;
+  height: 40px; }
 
 .pp-comment {
   font-size: 14px;
-  line-height: 18px;
-}
+  line-height: 18px; }
 
 .pp-comment-meta {
   margin-bottom: 5px;
   margin-top: 5px;
   float: none;
-  text-align: right;
-}
+  text-align: right; }
 
 #pp-comment-rbutton {
   margin-top: 10px;
-  margin-bottom: 10px;
-}
+  margin-bottom: 10px; }
 
 /* Gutenberg support */
 body.gutenberg-editor-page #pp-comments li {
   border-left: none;
   border-right: none;
   padding: 0 4px 0 0;
-  margin-bottom: 5px;
-}
-
+  margin-bottom: 5px; }
 body.gutenberg-editor-page #pp-comments img.avatar {
   width: 30px;
   margin-left: 0;
-  margin-right: 6px;
-}
-
+  margin-right: 6px; }
 body.gutenberg-editor-page #pp-comments h5 {
   margin-top: 1px;
-  margin-bottom: 4px;
-}
-
+  margin-bottom: 4px; }
 body.gutenberg-editor-page #pp-comments ul.children {
   margin-left: 14px;
-  margin-bottom: 7px;
-}
-
+  margin-bottom: 7px; }
 body.gutenberg-editor-page #pp-comments .comment-content {
-  margin-left: 0;
-}
-
+  margin-left: 0; }
 body.gutenberg-editor-page #pp-comments {
-  background: none;
-}
-
+  background: none; }
 body.gutenberg-editor-page #pp-comments .comment-content p {
-  margin: 0;
-}
-
-body.gutenberg-editor-page #pp-comments li p.row-actions {
-  margin: 4px 0;
-}
+  margin: 0; }
+body.gutenberg-editor-page #pp-comments li .row-actions {
+  margin: 4px 0; }
 
 /*# sourceMappingURL=editorial-comments.css.map */
diff --git a/modules/editorial-comments/lib/editorial-comments.css.map b/modules/editorial-comments/lib/editorial-comments.css.map
index ec3116085..5b773df7b 100644
--- a/modules/editorial-comments/lib/editorial-comments.css.map
+++ b/modules/editorial-comments/lib/editorial-comments.css.map
@@ -1,10 +1,7 @@
 {
-  "version": 3,
-  "sourceRoot": "",
-  "sources": [
-    "editorial-comments.scss"
-  ],
-  "names": [],
-  "mappings": "AAAA;AAEA;EACE;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;AACE;EACA;EACA;;;AAGF;AAAA;AAAA;AAAA;AAIA;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;;;AAMF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;AAEE;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE",
-  "file": "editorial-comments.css"
+"version": 3,
+"mappings": "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",
+"sources": ["editorial-comments.scss"],
+"names": [],
+"file": "editorial-comments.css"
 }
diff --git a/modules/editorial-comments/lib/editorial-comments.js b/modules/editorial-comments/lib/editorial-comments.js
index c7f86a200..51fb39b80 100644
--- a/modules/editorial-comments/lib/editorial-comments.js
+++ b/modules/editorial-comments/lib/editorial-comments.js
@@ -2,7 +2,7 @@ jQuery(function ($) {
   editorialCommentReply.init();
 
   // Check if certain hash flag set and take action
-  if (location.hash == '#editorialcomments/add') {
+  if (location.hash === '#editorialcomments/add') {
     editorialCommentReply.open();
   } else if (location.hash.search(/#editorialcomments\/reply/) > -1) {
     var reply_id = location.hash.substring(location.hash.lastIndexOf('/') + 1);
@@ -63,6 +63,8 @@ editorialCommentReply = {
    * @id = comment id
    */
   open: function (id) {
+    editorialCommentEdit.close();
+
     var parent;
 
     // Close any open reply boxes
@@ -95,7 +97,6 @@ editorialCommentReply = {
    */
   send: function (reply) {
     var post = {};
-    var containter_id = '#pp-replyrow';
 
     jQuery('#pp-replysubmit .error').html('').hide();
 
@@ -131,6 +132,8 @@ editorialCommentReply = {
   },
 
   show: function (xml) {
+    editorialCommentEdit.close();
+
     var response, comment, supplemental, id, bg;
 
     // Didn't pass validation, so let's throw an error
@@ -196,3 +199,157 @@ editorialCommentReply = {
     }
   }
 };
+
+editorialCommentEdit = {
+  $: jQuery,
+
+  init: function () {},
+
+  close: function () {
+    var $editRow = this.$('#pp-editrow');
+
+    var id = $editRow.data('id');
+    this.$('#comment-' + id + ' .comment-content').show();
+
+    $editRow.remove();
+  },
+
+  open: function (id) {
+    editorialCommentReply.revert();
+
+    // Close any open reply boxes
+    this.close();
+
+    // Check if reply or new comment
+    if (!id) {
+      return false;
+    }
+
+    var $rowActions = this.$('#comment-' + id + ' .post-comment-wrap .row-actions');
+    var $content    = this.$('#comment-' + id + ' .comment-content');
+
+    var $editBox = this.$('<div id="pp-editrow" data-id="' + id + '"><div id="pp-editcontainer"></div></div>');
+    $rowActions.before($editBox);
+
+    var $textArea = this.$('<textarea id="pp-editcontent" name="editcontent" cols="40" rows="5" spellcheck="false">');
+    var $editContainer = this.$('#pp-editcontainer');
+    $editContainer.append($textArea);
+    $textArea.val($content.text());
+    $content.hide();
+
+    var $editSubmit = this.$('<div id="pp-editsubmit">');
+    $editContainer.append($editSubmit);
+
+    var $buttonSave = this.$('<a class="button pp-editsave button-primary alignright" href="#pp-editrow">' + wp.i18n.__('Save', 'publishpress') + '</a>');
+    var $buttonCancel = this.$('<a class="button pp-editcancel alignright" href="#pp-editrow">' + wp.i18n.__('Cancel', 'publishpress') + '</a>');
+    $editSubmit.append($buttonSave);
+    $editSubmit.append($buttonCancel);
+
+    $buttonCancel.on('click', this.close.bind(this));
+    $buttonSave.on('click', this.send.bind(this));
+
+    return false;
+  },
+
+  send: function (reply) {
+    var post = {};
+    var self = this;
+
+    this.$('.pp-error').remove();
+
+    var $li = this.$(this.$('#pp-editcontent').parents('li')[0]);
+
+    // Validation: check to see if comment entered
+    post.content = this.$.trim(this.$('#pp-editcontent').val());
+    if (!post.content) {
+      var $errorLine = this.$('<div class="pp-error">').text('Please enter a comment');
+      this.$('#pp-editcontainer').append($errorLine);
+      return;
+    }
+
+    this.$('#pp-comment_loading').remove();
+    var $loading = this.$('<img alt="' + wp.i18n.__('Sending content...', 'publishpress') + '" src="' + publishpressEditorialCommentsParams.loadingImgSrc + '" class="alignright" id="pp-comment_loading"/>');
+    this.$('#pp-editcontainer').append($loading);
+
+    // Prepare data
+    post.action = 'publishpress_ajax_edit_comment';
+    post._nonce = this.$('#pp_comment_nonce').val();
+    post.comment_id = $li.data('id');
+    post.post_id = $li.data('post-id');
+
+    // Send the request
+    this.$.ajax({
+      type: 'POST',
+      url: (ajaxurl) ? ajaxurl : wpListL10n.url,
+      data: post,
+      success: function (x) {
+        self.$('#comment-' + post.comment_id + ' .comment-content').html(x.content);
+        self.close();
+      },
+      error: function (r) {
+        let $errorLine = self.$('<div class="pp-error">').html(r.responseText);
+        self.$('#pp-editcontainer').append($errorLine);
+        self.$('#pp-comment_loading').remove();
+      }
+    });
+
+
+    return false;
+  },
+};
+
+editorialCommentDelete = {
+  $: jQuery,
+
+  init: function () {
+  },
+
+  close: function() {
+    let $editRow = this.$('#pp-editrow');
+    $editRow.remove();
+  },
+
+  open: function (id) {
+    const hasChildComments = this.$(`#pp-comments [data-parent="${id}"]`).length > 0;
+
+    this.close();
+
+    if (hasChildComments) {
+      alert(wp.i18n.__('This comment can\'t be deleted because it has one or more replies. Before deleting it make sure to delete all the replies first.', 'publishpress'));
+      return;
+    }
+
+    if (confirm(wp.i18n.__('Are you sure you want to delete this comment?', 'publishpress'))) {
+      var self = this;
+
+      var $rowActions = this.$('#comment-' + id + ' .post-comment-wrap .row-actions');
+      var $editBox = this.$('<div id="pp-editrow" data-id="' + id + '"><div id="pp-editcontainer"></div></div>');
+      $rowActions.before($editBox);
+
+      // Prepare data
+      let data = {};
+
+      data.action = 'publishpress_ajax_delete_comment';
+      data._nonce = this.$('#pp_comment_nonce').val();
+      data.comment_id = id;
+
+      // Send the request
+      this.$.ajax({
+        type: 'POST',
+        url: (ajaxurl) ? ajaxurl : wpListL10n.url,
+        data: data,
+        success: function (x) {
+          self.$('#comment-' + id).remove();
+
+          editorialCommentEdit.close();
+          editorialCommentReply.revert();
+        },
+        error: function (r) {
+          let $errorLine = self.$('<div class="pp-error">').html(r.responseText);
+          self.$('#pp-editcontainer').append($errorLine);
+          self.$('#pp-comment_loading').remove();
+        }
+      });
+    }
+  }
+};
diff --git a/modules/editorial-comments/lib/editorial-comments.scss b/modules/editorial-comments/lib/editorial-comments.scss
index 5dfe46d84..e6ebd1953 100644
--- a/modules/editorial-comments/lib/editorial-comments.scss
+++ b/modules/editorial-comments/lib/editorial-comments.scss
@@ -40,12 +40,16 @@
   background: #fff;
 }
 
-#pp-comments li:hover p.row-actions {
+#pp-comments li:hover .row-actions {
   visibility: visible;
 }
 
-#pp-comments li p.row-actions {
+#pp-comments li .row-actions {
   text-align: right;
+  margin: 4px 0;
+  display: block;
+  width: 100%;
+  height: 20px;
 }
 
 #pp-comments ul.children {
@@ -59,6 +63,18 @@
   border-bottom: 1px solid #e5e5e5;
 }
 
+#pp-comment_loading {
+  margin-left: 10px;
+}
+
+#pp-editcontainer .pp-error {
+  width: calc(100% - 70px);
+  margin-left: 70px;
+  padding: 10px;
+  background: #ffdddd;
+  border: 1px solid #f7bebe;
+}
+
 /*
 #pp-comments .even { background: none; }
 #pp-comments .odd { background: none; }
@@ -97,28 +113,42 @@
   margin: 0.7em 0;
 }
 
-#pp-replyrow {
-}
-
 #pp-replyrow #pp-replycontent {
   width: 100%;
-  height: 100px;
+  height: 150px;
+  padding: 5px;
+}
+
+#pp-editrow #pp-editcontent {
+  box-sizing: border-box;
+  width: calc(100% - 70px);
+  height: 150px;
+  margin-left: 70px;
+  padding: 5px;
 }
 
+#pp-editrow #pp-editsubmit,
 #pp-replyrow #pp-replysubmit {
   margin: 6px 0;
 }
 
+#pp-editrow #pp-editsubmit *,
 #pp-replyrow #pp-replysubmit * {
   margin-left: 3px;
 }
 
+#pp-editrow #pp-editsubmit .error,
 #pp-replyrow #pp-replysubmit .error {
   margin: 6px 6px 0 0;
   line-height: 1.2em;
   padding: 4px 10px;
 }
 
+#pp-editrow #pp-editsubmit {
+  width: 100%;
+  height: 40px;
+}
+
 .pp-comment {
   font-size: 14px;
   line-height: 18px;
@@ -173,7 +203,7 @@ body.gutenberg-editor-page {
     margin: 0;
   }
 
-  #pp-comments li p.row-actions {
+  #pp-comments li .row-actions {
     margin: 4px 0;
   }
 }
diff --git a/publishpress.php b/publishpress.php
index f3f62fd2d..688656439 100644
--- a/publishpress.php
+++ b/publishpress.php
@@ -5,7 +5,7 @@
  * Description: PublishPress helps you plan and publish content with WordPress. Features include a content calendar, notifications, and custom statuses.
  * Author: PublishPress
  * Author URI: https://publishpress.com
- * Version: 3.4.1
+ * Version: 3.5.0
  * Text Domain: publishpress
  * Domain Path: /languages
  *
@@ -136,6 +136,10 @@ public static function activation_hook()
                 'pp_view_content_overview',
                 'edit_post_subscriptions',
                 'pp_set_notification_channel',
+                'pp_delete_editorial_comment',
+                'pp_delete_others_editorial_comment',
+                'pp_edit_editorial_comment',
+                'pp_edit_others_editorial_comment',
             ];
 
             $roles = [
@@ -1138,6 +1142,10 @@ public function filterCapabilities($capabilities)
             $newCapabilities = [
                 'pp_edit_editorial_metadata',
                 'pp_view_editorial_metadata',
+                'pp_delete_editorial_comment',
+                'pp_delete_others_editorial_comment',
+                'pp_edit_editorial_comment',
+                'pp_edit_others_editorial_comment',
             ];
 
             foreach ($newCapabilities as $capability) {
diff --git a/readme.txt b/readme.txt
index 0199e77e2..c34f9dc22 100644
--- a/readme.txt
+++ b/readme.txt
@@ -6,7 +6,7 @@ Tags: editorial calendar, notifications, custom statuses, editorial comments, wo
 Requires at least: 4.6
 Requires PHP: 5.6
 Tested up to: 5.7
-Stable tag: 3.4.1
+Stable tag: 3.5.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -120,6 +120,12 @@ Follow PublishPress on [Facebook](https://www.facebook.com/publishpress), [Twitt
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+= [3.5.0] - 5 Aug 2021 =
+
+* Added: Add the option to edit and delete editorial comments, #277;
+* Added: Add new capabilities to control who can edit or delete editorial comments: pp_delete_editorial_comment, pp_delete_others_editorial_comment, pp_edit_editorial_comment, pp_edit_others_editorial_comment, #277;
+* Fixed: Fix long text on the posts attributes in the calendar popup, #917;
+
 = [3.4.1] - 19 Jul 2021 =
 
 * Fixed: Fix the visual feedback for the calendar items drag and drop, #881;