diff --git a/resources/styles/framework.scss b/resources/styles/framework.scss
index 76640d38e..bfa4f000a 100644
--- a/resources/styles/framework.scss
+++ b/resources/styles/framework.scss
@@ -93,7 +93,7 @@
   color: $color-white;
   &:hover {
     background: $color-white;
-    color: $color-complete;;
+    color: $color-info-dark;
   }
 }
 .btn-large {
@@ -858,6 +858,7 @@ input[type=range]:focus::-ms-fill-upper {
     border-bottom: 3px solid transparent;
     color: $color-white;
     display: flex;
+    flex-wrap: wrap;
     min-height: 100px;
     margin: 0 auto;
     padding: $medium $big;
@@ -891,6 +892,14 @@ input[type=range]:focus::-ms-fill-upper {
 
     }
 
+    .message-action {
+      align-items: center;
+      display: flex;
+      justify-content: space-around;
+      margin-top: $medium;
+      width: 100%;
+    }
+
   }
 
   &.error {
diff --git a/src/uxbox/ui/messages.cljs b/src/uxbox/ui/messages.cljs
index bc1d8bef5..eedd0ced7 100644
--- a/src/uxbox/ui/messages.cljs
+++ b/src/uxbox/ui/messages.cljs
@@ -26,7 +26,7 @@
 
 (defn error
   ([message] (error message nil))
-  ([message {:keys [timeout] :or {timeout 3000}}]
+  ([message {:keys [timeout] :or {timeout 30000}}]
    (when-let [prev-message @+message+]
      (abort-timeout! (:timeout-total prev-message))
      (abort-timeout! (:timeout prev-message)))
@@ -55,7 +55,11 @@
        [:div.message {:class classes}
         [:div.message-body
          [:span.close i/close]
-         [:span (:content message)]]]))))
+         [:span (:content message)]
+         [:div.message-action
+          [:a.btn-transparent.btn-small "Accept"]
+          [:a.btn-transparent.btn-small "Cancel"]
+          ]]]))))
 
 (def ^:const messages
   (mx/component