diff --git a/public/legacy/themes/suite8/css/Dawn/style.scss b/public/legacy/themes/suite8/css/Dawn/style.scss
index 00971aae0..440581843 100644
--- a/public/legacy/themes/suite8/css/Dawn/style.scss
+++ b/public/legacy/themes/suite8/css/Dawn/style.scss
@@ -193,4 +193,5 @@
 @import '../suitep-base/importvcard.scss';
 @import '../suitep-base/campaign-mobile.scss';
 @import '../suitep-base/inboundemail-mobile.scss';
+@import '../suitep-base/email-queue-mobile.scss';
 //
diff --git a/public/legacy/themes/suite8/css/suitep-base/email-queue-mobile.scss b/public/legacy/themes/suite8/css/suitep-base/email-queue-mobile.scss
new file mode 100644
index 000000000..25945b955
--- /dev/null
+++ b/public/legacy/themes/suite8/css/suitep-base/email-queue-mobile.scss
@@ -0,0 +1,23 @@
+@media (max-width:768px){
+    .view-module-EmailMan {
+        #searchDialog {
+            .modal-dialog {
+                margin-top: 8em;
+                .modal-header {
+                    padding-bottom: 0;
+                }
+                .modal-body {
+                    .modal-content .search_form .view select#saved_search_select {
+                        border: 1px solid $form-border-color;
+                    }
+                    .quick-filter {
+                        display:block !important;
+                    }
+                    .submitButtonsAdvanced {
+                        float: left;
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/public/legacy/themes/suite8/css/suitep-base/email-queue.scss b/public/legacy/themes/suite8/css/suitep-base/email-queue.scss
index 3a2ed7583..3a1ce9bd8 100644
--- a/public/legacy/themes/suite8/css/suitep-base/email-queue.scss
+++ b/public/legacy/themes/suite8/css/suitep-base/email-queue.scss
@@ -1,5 +1,98 @@
-.view-module-EmailMan {
-    .view {
-        border-radius: 10px;
+.view-module-EmailMan.view-action-index,
+.view-module-EmailMan.view-action-default
+{
+    .moduleTitle {
+        border-bottom: 1px solid $header-bottom-border;
+        width: 100%;
+        .module-title-text {
+            color: $shell-grey;
+        }
     }
+    #searchDialog {
+        .modal-dialog {
+            .nav-tabs {
+                margin-bottom: 0;
+            }
+            a#basic_search_link {
+                background-color: #93a4b3;
+                background-size: 8px;
+                position: relative;
+                top: 2px;
+                line-height: 32px;
+                height: auto;
+                background-position: 120px 6px;
+                font-weight: 600;
+                text-transform: capitalize;
+                @media (max-width: 768px) {
+                    margin-bottom: 1em;
+                }                
+            }
+            .modal-content {
+                #EmailManbasic_searchSearchForm,#EmailManadvanced_searchSearchForm {
+                    padding-left: 1em;
+                    .moduleTitle {
+                        border-bottom: none;
+                    }
+                }
+                #EmailManadvanced_searchSearchForm {
+                    .moduleTitle {
+                        margin-bottom: 1em;
+                    }
+                    @media (max-width:600px) {
+                        input[value^="Save"] {
+                            margin-top: 0.5em;
+                        }
+                    }
+                }
+                .quick-filter {
+                    display: flex;
+                }
+                .saved-search {
+                    margin-left: 1em;
+                    @media (max-width: 768px) {
+                        margin-left: 0;
+                    }
+                }
+            }
+        }
+    }
+    .button {
+        background-color: $nepal-grey;
+        border-radius: 0.2em;
+        font-weight: bold;
+        height: 2.2em;
+        line-height: 1em;
+        letter-spacing: 0.05em;
+        padding: 0.3em 1em;
+        text-transform: capitalize;
+        border: none;
+        &:hover {
+            background: $pale-blue !important;
+        }
+    }
+    input[type=text] {
+        background-color:$transparent-color !important;
+        border: 1px solid $form-border-color;
+    }
+    select {
+        background: url($select-edit-background-url) no-repeat right;
+        background-size: 25px 11px;
+        border-color: $bright-grey;
+        border: 1px solid $form-border-color !important;
+    }  
+    .list .SugarActionMenu .sugar_action_button>.subnav li:last-of-type a:last-of-type {
+        padding: 5px 20px;
+    }
+}   
+
+@media (max-width: 768px) {
+    .view-module-EmailMan.view-action-index {
+        .modal-dialog {
+            width: 90vw;
+            margin: 80px 30px auto;
+        }
+        .buttons input.button[type=submit]:hover, input.button[type=button]:hover, input.button[type=reset]:hover {
+            font-size: 13px;
+        }
+    }    
 }
\ No newline at end of file
diff --git a/public/legacy/themes/suite8/include/SearchForm/tpls/SearchFormGenericAdvanced.tpl b/public/legacy/themes/suite8/include/SearchForm/tpls/SearchFormGenericAdvanced.tpl
index 8139e2821..30b3617fb 100644
--- a/public/legacy/themes/suite8/include/SearchForm/tpls/SearchFormGenericAdvanced.tpl
+++ b/public/legacy/themes/suite8/include/SearchForm/tpls/SearchFormGenericAdvanced.tpl
@@ -164,18 +164,23 @@
                            onclick='open_popup("Documents", 600, 400, "&caller=Documents", true, false, "");'/>
                 {/if}
                 {if $searchFormInPopup}
-                <div>
-                    {/if}
+                <div class="quick-filter">
+                    <div>
+                        {/if}
                     <a id="basic_search_link" href="javascript:void(0)"
                        accesskey="{$APP.LBL_ADV_SEARCH_LNK_KEY}">{$APP.LNK_BASIC_FILTER}</a>
-        <span class='white-space'>
-            &nbsp;&nbsp;&nbsp;{if $SAVED_SEARCHES_OPTIONS}|&nbsp;&nbsp;&nbsp;<b>{$APP.LBL_SAVED_FILTER_SHORTCUT}</b>&nbsp;
+                    </div>                    
+        <div class='saved-search'>           
+            {if $SAVED_SEARCHES_OPTIONS} <span class='mobile-hide'> | </span>
+            <b>{$APP.LBL_SAVED_FILTER_SHORTCUT}</b>
             {$SAVED_SEARCHES_OPTIONS} {/if}
-            <span id='go_btn_span' style='display:none'><input tabindex='2' title='go_select' id='go_select'
+            <span id='go_btn_span' style='display:none'>
+            <input tabindex='2' title='go_select' id='go_select'
                                                                onclick='SUGAR.searchForm.clear_form(this.form);'
                                                                class='button' type='button' name='go_select'
-                                                               value=' {$APP.LBL_GO_BUTTON_LABEL} '/></span>
-        </span>
+                                                               value=' {$APP.LBL_GO_BUTTON_LABEL} '/>
+                                                            </span>
+        </div>
                     {if $searchFormInPopup}
                 </div>
                 {/if}