diff --git a/skins/elastic/swipe.less b/skins/elastic/swipe.less
index 86e4fbb..b51c098 100644
--- a/skins/elastic/swipe.less
+++ b/skins/elastic/swipe.less
@@ -40,7 +40,8 @@
 
   &.forward,
   &.reply,
-  &.replyall {
+  &.replyall,
+  &.notjunk {
     background-color: @color-message-success;
     color: #fff;
   }
@@ -133,6 +134,10 @@
       &.junk::before {
         content: @fa-var-fire;
       }
+
+      &.notjunk::before {
+        content: @fa-var-inbox;
+      }
     }
   }
 }
diff --git a/skins/elastic/swipe.min.css b/skins/elastic/swipe.min.css
index ccdbf93..422cd98 100644
--- a/skins/elastic/swipe.min.css
+++ b/skins/elastic/swipe.min.css
@@ -1 +1 @@
-#listoptions-menu>fieldset.swipe{margin-top:1.5rem}#swipe-action{position:absolute;background-color:#f1f3f4;color:#161b1d;display:flex;align-items:center;border-collapse:collapse}#swipe-action.checkmail,#swipe-action.select,#swipe-action.deselect{background-color:#8b9fa7;color:#fff}#swipe-action.delete,#swipe-action.junk{background-color:#ff5552;color:#fff}#swipe-action.flagged,#swipe-action.unflagged,#swipe-action.read,#swipe-action.unread{background-color:#37beff;color:#fff}#swipe-action.forward,#swipe-action.reply,#swipe-action.replyall{background-color:#41b849;color:#fff}#swipe-action.move,#swipe-action.archive{background-color:#ffd452;color:#fff}#swipe-action>div.left{position:absolute;right:.5em}#swipe-action>div.down{margin:0 auto}#swipe-action>div.down>span::before{width:auto;float:none;margin:0;margin-bottom:.2em;padding:0}#swipe-action>div>span{line-height:100%;font-size:1.2em}#swipe-action>div>span::before{font-size:1.25em;display:block;float:left;margin:0 .25rem 0 0;width:1.18em;height:1em;font-family:'Icons';font-style:normal;font-weight:900;text-decoration:inherit;text-align:center;speak:none;font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;padding:0 1.25em 0 .5em}#swipe-action>div>span.checkmail::before{content:"\f021"}#swipe-action>div>span.delete::before{content:"\f2ed"}#swipe-action>div>span.flagged::before{content:"\f024"}#swipe-action>div>span.forward::before{content:"\f064"}#swipe-action>div>span.unflagged::before{content:"\f024";font-weight:400}#swipe-action>div>span.move::before{content:"\f0b2"}#swipe-action>div>span.read::before{content:"\f111";font-weight:400}#swipe-action>div>span.unread::before{content:"\f111"}#swipe-action>div>span.reply::before{content:"\f3e5"}#swipe-action>div>span.replyall::before{content:"\f122"}#swipe-action>div>span.select::before{content:"\f14a";font-weight:400}#swipe-action>div>span.deselect::before{content:"\f0c8";font-weight:400}#swipe-action>div>span.archive::before{content:"\f187"}#swipe-action>div>span.junk::before{content:"\f06d"}.swipe-active,.swipe-active>td{background-color:#fff}#messagelist-content{overscroll-behavior:contain}#messagelist.swipe-active{display:block;height:100%}
\ No newline at end of file
+#listoptions-menu>fieldset.swipe{margin-top:1.5rem}#swipe-action{position:absolute;background-color:#f1f3f4;color:#161b1d;display:flex;align-items:center;border-collapse:collapse}#swipe-action.checkmail,#swipe-action.select,#swipe-action.deselect{background-color:#8b9fa7;color:#fff}#swipe-action.delete,#swipe-action.junk{background-color:#ff5552;color:#fff}#swipe-action.flagged,#swipe-action.unflagged,#swipe-action.read,#swipe-action.unread{background-color:#37beff;color:#fff}#swipe-action.forward,#swipe-action.reply,#swipe-action.replyall,#swipe-action.notjunk{background-color:#41b849;color:#fff}#swipe-action.move,#swipe-action.archive{background-color:#ffd452;color:#fff}#swipe-action>div.left{position:absolute;right:.5em}#swipe-action>div.down{margin:0 auto}#swipe-action>div.down>span::before{width:auto;float:none;margin:0;margin-bottom:.2em;padding:0}#swipe-action>div>span{line-height:100%;font-size:1.2em}#swipe-action>div>span::before{font-size:1.25em;display:block;float:left;margin:0 .25rem 0 0;width:1.18em;height:1em;font-family:'Icons';font-style:normal;font-weight:900;text-decoration:inherit;text-align:center;speak:none;font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;padding:0 1.25em 0 .5em}#swipe-action>div>span.checkmail::before{content:"\f021"}#swipe-action>div>span.delete::before{content:"\f2ed"}#swipe-action>div>span.flagged::before{content:"\f024"}#swipe-action>div>span.forward::before{content:"\f064"}#swipe-action>div>span.unflagged::before{content:"\f024";font-weight:400}#swipe-action>div>span.move::before{content:"\f0b2"}#swipe-action>div>span.read::before{content:"\f111";font-weight:400}#swipe-action>div>span.unread::before{content:"\f111"}#swipe-action>div>span.reply::before{content:"\f3e5"}#swipe-action>div>span.replyall::before{content:"\f122"}#swipe-action>div>span.select::before{content:"\f14a";font-weight:400}#swipe-action>div>span.deselect::before{content:"\f0c8";font-weight:400}#swipe-action>div>span.archive::before{content:"\f187"}#swipe-action>div>span.junk::before{content:"\f06d"}#swipe-action>div>span.notjunk::before{content:"\f01c"}.swipe-active,.swipe-active>td{background-color:#fff}#messagelist-content{overscroll-behavior:contain}#messagelist.swipe-active{display:block;height:100%}
\ No newline at end of file
diff --git a/swipe.js b/swipe.js
index 70d686b..44c76c6 100644
--- a/swipe.js
+++ b/swipe.js
@@ -105,9 +105,17 @@ rcube_webmail.prototype.swipe = {
             action.callback = function(p) { rcmail.swipe.action_callback('forward', 'compose', p); };
         }
         else if (rcmail.env.swipe_actions[direction] == 'markasjunk') {
-            action.class = 'junk';
-            action.text = 'markasjunk.buttontitle';
-            action.callback = function(p) { rcmail.swipe.action_callback('plugin.markasjunk', null, p); };
+            var spam_folder = rcmail.env.mailbox == rcmail.env.markasjunk_spam_mailbox;
+            if (!rcmail.env.markasjunk_spam_only && spam_folder) {
+                action.class = 'notjunk';
+                action.text = 'markasjunk.markasnotjunk';
+                action.callback = function(p) { rcmail.swipe.action_callback('plugin.markasjunk.not_junk', null, p); };
+            }
+            else {
+                action.class = 'junk';
+                action.text = 'markasjunk.markasjunk';
+                action.callback = spam_folder ? null : function(p) { rcmail.swipe.action_callback('plugin.markasjunk.junk', null, p); };
+            }
         }
         else if (rcmail.env.swipe_actions[direction] == 'move') {
             action.class = 'move';
diff --git a/swipe.php b/swipe.php
index e549f84..18b4f3b 100644
--- a/swipe.php
+++ b/swipe.php
@@ -45,7 +45,7 @@ class swipe extends rcube_plugin
                 'move' => 'moveto',
                 'swipe-select' => 'select',
                 'archive' => 'archive.buttontext',
-                'markasjunk' => 'markasjunk.buttontitle'
+                'markasjunk' => 'markasjunk.markasjunk'
             )
         )
     );