diff -urN ../roundcubemail-1.2.0.orig/program/steps/mail/compose.inc ./program/steps/mail/compose.inc
--- ../roundcubemail-1.2.0.orig/program/steps/mail/compose.inc	2016-05-22 14:06:47.000000000 +0300
+++ ./program/steps/mail/compose.inc	2016-07-04 20:31:41.000000000 +0300
@@ -494,7 +494,9 @@
             && !$RCMAIL->config->get('sig_below')
             && ($COMPOSE['mode'] == RCUBE_COMPOSE_REPLY || $COMPOSE['mode'] == RCUBE_COMPOSE_FORWARD);
 
-        $separator     = $top_posting ? '---' : '-- ';
+//        $separator     = $top_posting ? '---' : '-- ';
+        $separator = ($top_posting ? $RCMAIL->config->get('sig_separator_top_posting') : $RCMAIL->config->get('sig_separator_bottom_posting'));
+        if (!$separator) $separator = $top_posting ? '---' : '-- ';
         $add_separator = (bool) $RCMAIL->config->get('sig_separator');
 
         $field_attrib['onchange'] = rcmail_output::JS_OBJECT_NAME.".change_identity(this)";