diff --git a/src/app/email/controllers/EmailController.php b/src/app/email/controllers/EmailController.php
index e7a20bf7e83c615618c268555709a7bba3d69bf0..490ffb1d19f42ab92be49b365968ae80f408ff4e 100644
--- a/src/app/email/controllers/EmailController.php
+++ b/src/app/email/controllers/EmailController.php
@@ -503,21 +503,29 @@ class EmailController
         $document = [];
         if (!empty($resource['filename'])) {
             $convertedResource = AdrModel::getDocuments([
-                'select'    => ['docserver_id', 'path', 'filename'],
+                'select'    => ['docserver_id', 'path', 'filename', 'type'],
                 'where'     => ['res_id = ?', 'type in (?)', 'version = ?'],
                 'data'      => [$args['resId'], ['PDF', 'SIGN'], $resource['version']],
                 'orderBy'   => ["type='SIGN' DESC"],
                 'limit'     => 1
             ]);
             $convertedDocument = null;
+            $isSigned = false;
             if (!empty($convertedResource[0])) {
-                $docserver = DocserverModel::getByDocserverId(['docserverId' => $convertedResource[0]['docserver_id'], 'select' => ['path_template']]);
-                $pathToDocument = $docserver['path_template'] . str_replace('#', DIRECTORY_SEPARATOR, $convertedResource[0]['path']) . $convertedResource[0]['filename'];
+                $docserver = DocserverModel::getByDocserverId([
+                    'docserverId' => $convertedResource[0]['docserver_id'],
+                    'select' => ['path_template']
+                ]);
+                $pathToDocument = $docserver['path_template'] .
+                    str_replace('#', DIRECTORY_SEPARATOR, $convertedResource[0]['path']) .
+                    $convertedResource[0]['filename'];
                 if (file_exists($pathToDocument)) {
                     $convertedDocument = [
                         'size'  => StoreController::getFormattedSizeFromBytes(['size' => filesize($pathToDocument)])
                     ];
                 }
+
+                $isSigned = ($convertedResource[0]['type'] === 'SIGN');
             }
 
             $document = [
@@ -527,7 +535,8 @@ class EmailController
                 'convertedDocument' => $convertedDocument,
                 'creator'           => UserModel::getLabelledUserById(['id' => $resource['typist']]),
                 'format'            => $resource['format'],
-                'size'              => StoreController::getFormattedSizeFromBytes(['size' => $resource['filesize']])
+                'size'              => StoreController::getFormattedSizeFromBytes(['size' => $resource['filesize']]),
+                'isSigned'          => $isSigned
             ];
         }
 
diff --git a/src/frontend/plugins/mail-editor/mail-editor.component.html b/src/frontend/plugins/mail-editor/mail-editor.component.html
index fadf5e14ee29a54457916c70c6c92d7642b7d984..ef4f80c3a5a6ed18e23714edc063f8a4bce0014c 100644
--- a/src/frontend/plugins/mail-editor/mail-editor.component.html
+++ b/src/frontend/plugins/mail-editor/mail-editor.component.html
@@ -114,15 +114,18 @@
                             [disabled]="isSelectedAttachMail(attach,keyVal.key)" (click)="$event.stopPropagation();">
                             <div class="attachListContainer">
                                 <div>
-                                    <button mat-raised-button class="extensionButton" color="primary"
-                                        *ngIf="attach.status !== 'SIGN'"
-                                        (click)="toggleAttachMail(attach,keyVal.key,'original');">.{{attach.format}}
-                                    </button><br/>
-                                    <button mat-raised-button class="extensionButton" color="primary"
-                                        *ngIf="(!functions.empty(attach.convertedDocument) && attach.format !== 'pdf') || attach.status === 'SIGN'"
-                                        (click)="toggleAttachMail(attach,keyVal.key,'pdf');">
-                                        .pdf
-                                    </button>
+                                    <ng-container *ngIf="attach.status !== 'SIGN' && !attach.isSigned">
+                                        <button mat-raised-button class="extensionButton" color="primary"
+                                                (click)="toggleAttachMail(attach,keyVal.key,'original');">.{{attach.format}}
+                                        </button>
+                                        <br/>
+                                    </ng-container>
+                                    <ng-container *ngIf="(!functions.empty(attach.convertedDocument) && attach.format !== 'pdf') || attach.status === 'SIGN' || attach.isSigned">
+                                        <button mat-raised-button class="extensionButton" color="primary"
+                                                (click)="toggleAttachMail(attach,keyVal.key,'pdf');">.{{attach.format}}
+                                        </button>
+                                        <br/>
+                                    </ng-container>
                                 </div>
                                 <div>
                                     <span [title]="attach.label">
@@ -193,4 +196,4 @@
     </div>
     <textarea *ngIf="!bodyHide" style="padding-top: 10px;visibility: hidden;" name="emailSignature" id="emailSignature"
         [(ngModel)]="emailContent"></textarea>
-</div>
\ No newline at end of file
+</div>