diff -urN ../roundcubemail-1.1.2.orig/program/steps/mail/compose.inc ./program/steps/mail/compose.inc
--- ../roundcubemail-1.1.2.orig/program/steps/mail/compose.inc	2015-06-05 15:46:48.000000000 +0300
+++ ./program/steps/mail/compose.inc	2016-01-20 18:13:20.000000000 +0200
@@ -616,7 +616,9 @@
         $top_posting  = intval($RCMAIL->config->get('reply_mode')) > 0
             && !$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'));
+        if (!$separator) $separator = $top_posting ? '---' : '-- ';
 
         $field_attrib['onchange'] = rcmail_output::JS_OBJECT_NAME.".change_identity(this)";
         $select_from = new html_select($field_attrib);