Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 program/steps/mail/attachments.inc

@@ -118,9 +118,12 @@
          'alt' => rcube_label('delete')
        ));
      }
      else {
      else if ($COMPOSE['textbuttons']) {
        $button = Q(rcube_label('delete'));
      }
      else {
        $button = '';
      }

      $content = html::a(array(
        'href' => "#delete",