diff --git a/src/modules/rendicontazione/pages/PraticaRendicontazioneEdit.js b/src/modules/rendicontazione/pages/PraticaRendicontazioneEdit.js
index 24b539b..d82d554 100644
--- a/src/modules/rendicontazione/pages/PraticaRendicontazioneEdit.js
+++ b/src/modules/rendicontazione/pages/PraticaRendicontazioneEdit.js
@@ -360,10 +360,33 @@ const PraticaRendicontazioneEdit = () => {
             toast.current?.show({ severity: 'warn', summary: __('Risposta troppo corta', 'gepafin') });
             return;
         }
+        const fileToUpload = amendDialog.response_file;
+        const amendmentId = amendDialog.amendment.id;
+
         RendicontazioneService.respondAmendmentBeneficiary(
-            practiceId, amendDialog.amendment.id, amendDialog.responseText,
-            (resp) => { setAmendDialog({ visible: false, amendment: null, responseText: '' });
-                       afterMutation(__('Risposta inviata all\'istruttore', 'gepafin'))(resp); },
+            practiceId, amendmentId, amendDialog.responseText,
+            (resp) => {
+                if (fileToUpload) {
+                    RendicontazioneService.uploadResponseDocument(practiceId, amendmentId, fileToUpload,
+                        () => {
+                            setAmendDialog({ visible: false, amendment: null, responseText: '', response_file: null });
+                            afterMutation(__('Risposta trasmessa con allegato', 'gepafin'))(resp);
+                        },
+                        (err) => {
+                            // testo salvato ma upload fallito — avviso e ricarico
+                            setAmendDialog({ visible: false, amendment: null, responseText: '', response_file: null });
+                            toast.current?.show({
+                                severity: 'warn',
+                                summary: __('Risposta salvata, upload allegato fallito', 'gepafin'),
+                                detail: err?.message || ''
+                            });
+                            afterMutation(null)(resp);
+                        });
+                } else {
+                    setAmendDialog({ visible: false, amendment: null, responseText: '', response_file: null });
+                    afterMutation(__('Risposta inviata all\'istruttore', 'gepafin'))(resp);
+                }
+            },
             onMutationError);
     };
 
@@ -465,8 +488,8 @@ const PraticaRendicontazioneEdit = () => {
                 </div>
             )}
 
-            {/* SOCCORSO ISTRUTTORIO (se presente) */}
-            {practice.amendments && practice.amendments.length > 0 && (<>
+            {/* SOCCORSO ISTRUTTORIO (se presente — esclude DRAFT, visibile solo quando PEC partita) */}
+            {practice.amendments && practice.amendments.filter(a => a.status !== 'DRAFT').length > 0 && (<>
                 <div className="appPage__spacer"></div>
                 <div className="appPageSection">
                     <h2>{__('Richieste di soccorso istruttorio', 'gepafin')}</h2>
@@ -474,7 +497,7 @@ const PraticaRendicontazioneEdit = () => {
                         {__('L\'istruttore ha chiesto integrazioni o chiarimenti. Rispondi al più presto.', 'gepafin')}
                     </p>
                     <div className="fieldsRepeater">
-                        {practice.amendments.map(a => {
+                        {practice.amendments.filter(a => a.status !== 'DRAFT').map(a => {
                             const statusCfg = {
                                 AWAITING: { sev: 'warning', label: 'In attesa della tua risposta' },
                                 RESPONSE_RECEIVED: { sev: 'info', label: 'Risposta inviata, in attesa di chiusura' },
@@ -484,25 +507,41 @@ const PraticaRendicontazioneEdit = () => {
                             return (
                                 <div key={a.id} className="fieldsRepeater__panel"
                                     style={{ border: '1px solid var(--surface-border)', borderRadius: '6px', padding: '1rem',
-                                             background: a.status === 'AWAITING' ? 'var(--orange-50)' : 'var(--surface-50)' }}>
-                                    <div className="fieldsRepeater__heading" style={{ marginBottom: '0.5rem' }}>
+                                             background: a.status === 'AWAITING' ? 'var(--orange-50, #fff7ed)' : 'var(--surface-50)',
+                                             marginBottom: '0.75rem' }}>
+                                    <div className="fieldsRepeater__heading" style={{ marginBottom: '0.5rem', display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start', flexWrap: 'wrap', gap: '0.5rem' }}>
                                         <div>
                                             <Tag severity={statusCfg.sev} value={statusCfg.label} />
-                                            <span style={{ marginLeft: '0.75rem', color: 'var(--text-color-secondary)' }}>
-                                                {__('Scadenza:', 'gepafin')} {new Date(a.deadline).toLocaleDateString('it-IT')}
+                                            <span style={{ marginLeft: '0.75rem', color: 'var(--text-color-secondary)', fontSize: '0.9em' }}>
+                                                {__('Scadenza:', 'gepafin')} <strong>{new Date(a.deadline).toLocaleDateString('it-IT')}</strong>
+                                                {a.response_days ? ` (${a.response_days}gg dalla richiesta)` : ''}
                                             </span>
                                         </div>
                                         {a.status === 'AWAITING' && (
                                             <Button icon="pi pi-reply" label={__('Rispondi', 'gepafin')} size="small" severity="warning"
-                                                onClick={() => setAmendDialog({ visible: true, amendment: a, responseText: '' })} />
+                                                onClick={() => setAmendDialog({ visible: true, amendment: a, responseText: '', response_file: null })} />
                                         )}
                                     </div>
                                     <div>
                                         <small className="text-color-secondary">{__('Richiesta istruttore:', 'gepafin')}</small>
-                                        <div style={{ whiteSpace: 'pre-wrap', marginBottom: '0.5rem' }}>{a.request_text}</div>
+                                        <div style={{ padding: '0.5rem', background: 'white', borderRadius: '4px', marginTop: '0.25rem', marginBottom: '0.5rem' }}
+                                             dangerouslySetInnerHTML={{ __html: a.request_text || '' }} />
+                                        {a.amendment_document_path && (
+                                            <div style={{ marginBottom: '0.5rem' }}>
+                                                <i className="pi pi-paperclip" style={{ marginRight: '0.25rem' }} />
+                                                <small className="text-color-secondary">{__('Allegato istruttore presente (disponibile via PEC)', 'gepafin')}</small>
+                                            </div>
+                                        )}
                                         {a.response_text && (<>
                                             <small className="text-color-secondary">{__('Tua risposta:', 'gepafin')}</small>
-                                            <div style={{ whiteSpace: 'pre-wrap', padding: '0.5rem', background: 'white', borderRadius: '4px', marginTop: '0.25rem' }}>{a.response_text}</div>
+                                            <div style={{ padding: '0.5rem', background: 'white', borderRadius: '4px', marginTop: '0.25rem' }}
+                                                 dangerouslySetInnerHTML={{ __html: a.response_text }} />
+                                            {a.response_document_path && (
+                                                <div style={{ marginTop: '0.25rem' }}>
+                                                    <i className="pi pi-paperclip" style={{ marginRight: '0.25rem' }} />
+                                                    <small className="text-color-secondary">{__('Allegato inviato con la risposta', 'gepafin')}</small>
+                                                </div>
+                                            )}
                                         </>)}
                                     </div>
                                 </div>
@@ -911,23 +950,52 @@ const PraticaRendicontazioneEdit = () => {
             </Dialog>
 
             {/* ---------- DIALOG RISPOSTA SOCCORSO ---------- */}
-            <Dialog visible={amendDialog.visible} style={{ width: '560px' }}
+            <Dialog visible={amendDialog.visible} style={{ width: '720px' }}
                 header={__('Rispondi al soccorso istruttorio', 'gepafin')} modal
-                onHide={() => setAmendDialog({ visible: false, amendment: null, responseText: '' })}>
+                onHide={() => setAmendDialog({ visible: false, amendment: null, responseText: '', response_file: null })}>
                 {amendDialog.amendment && (
                     <form className="appForm p-fluid" onSubmit={(e) => { e.preventDefault(); submitAmendmentResponse(); }}>
-                        <div style={{ padding: '0.75rem', background: 'var(--surface-50)', borderRadius: '4px', marginBottom: '1rem' }}>
-                            <small className="text-color-secondary">{__('Richiesta istruttore:', 'gepafin')}</small>
-                            <div style={{ whiteSpace: 'pre-wrap', marginTop: '0.25rem' }}>{amendDialog.amendment.request_text}</div>
+                        <div style={{ padding: '0.75rem', background: 'var(--surface-50)', borderRadius: '4px', marginBottom: '1rem', border: '1px solid var(--surface-border)' }}>
+                            <small className="text-color-secondary">
+                                <strong>{__('Richiesta istruttore', 'gepafin')}</strong>
+                                {amendDialog.amendment.response_days ? ` — ${__('hai', 'gepafin')} ${amendDialog.amendment.response_days} ${__('giorni per rispondere', 'gepafin')}` : ''}
+                            </small>
+                            <div style={{ marginTop: '0.25rem' }}
+                                 dangerouslySetInnerHTML={{ __html: amendDialog.amendment.request_text || '' }} />
+                            {amendDialog.amendment.amendment_document_path && (
+                                <div style={{ marginTop: '0.5rem', fontSize: '0.9em' }}>
+                                    <i className="pi pi-paperclip" style={{ marginRight: '0.25rem' }} />
+                                    <span className="text-color-secondary">{__('L\'istruttore ha allegato un documento (trasmesso via PEC)', 'gepafin')}</span>
+                                </div>
+                            )}
+                            <div style={{ marginTop: '0.5rem', fontSize: '0.9em', color: 'var(--text-color-secondary)' }}>
+                                <i className="pi pi-calendar" style={{ marginRight: '0.25rem' }} />
+                                {__('Scadenza:', 'gepafin')} <strong>{new Date(amendDialog.amendment.deadline).toLocaleDateString('it-IT')}</strong>
+                            </div>
                         </div>
+
                         <div className="appForm__field">
-                            <label>{__('La tua risposta', 'gepafin')}</label>
-                            <InputTextarea value={amendDialog.responseText} rows={5} autoResize
-                                onChange={(e) => setAmendDialog(d => ({ ...d, responseText: e.target.value }))}
-                                placeholder={__('Descrivi le integrazioni fornite, allegati caricati, chiarimenti...', 'gepafin')} />
+                            <label>{__('La tua risposta', 'gepafin')} <span style={{color:'var(--red-500)'}}>*</span></label>
+                            <Editor value={amendDialog.responseText} style={{ height: '180px' }}
+                                onTextChange={(e) => setAmendDialog(d => ({ ...d, responseText: e.htmlValue || '' }))}
+                                placeholder={__('Descrivi le integrazioni fornite, gli allegati caricati, i chiarimenti...', 'gepafin')} />
                         </div>
+
+                        <div className="appForm__field">
+                            <label>{__('Allegato alla risposta (opzionale, PDF)', 'gepafin')}</label>
+                            <FileUpload ref={responseFileRef} mode="basic" auto={false}
+                                chooseLabel={__('Scegli file PDF', 'gepafin')}
+                                accept="application/pdf" maxFileSize={10*1024*1024}
+                                customUpload uploadHandler={() => {}}
+                                onSelect={(e) => setAmendDialog(d => ({ ...d, response_file: e.files[0] || null }))} />
+                            <small className="text-color-secondary">
+                                {__('Documento integrativo (DURC aggiornato, chiarimento contabile, ecc.)', 'gepafin')}
+                            </small>
+                        </div>
+
                         <div style={{ display: 'flex', justifyContent: 'flex-end', gap: '0.75rem', marginTop: '1rem' }}>
-                            <Button type="button" outlined label={__('Annulla', 'gepafin')} onClick={() => setAmendDialog({ visible: false, amendment: null, responseText: '' })} />
+                            <Button type="button" outlined label={__('Annulla', 'gepafin')}
+                                onClick={() => setAmendDialog({ visible: false, amendment: null, responseText: '', response_file: null })} />
                             <Button type="submit" label={__('Invia risposta', 'gepafin')} icon="pi pi-send" severity="warning" />
                         </div>
                     </form>