diff --git a/frontend/src/components/pages/ReportingPage.js b/frontend/src/components/pages/ReportingPage.js
index df92711..970a867 100644
--- a/frontend/src/components/pages/ReportingPage.js
+++ b/frontend/src/components/pages/ReportingPage.js
@@ -2707,21 +2707,29 @@ function FpEditModal({ open, onClose, submission, queueItems, onSuccess }) {
                     {/* History tab */}
                     {activeTab === 'history' && (
                         <div>
-                            {/* Ivanti reviewer notes (rework/approval feedback) */}
-                            {(submission.ivanti_rework_note || submission.ivanti_current_state_notes) && (
-                                <div style={{
-                                    padding: '0.625rem 0.75rem', marginBottom: '0.75rem',
-                                    borderRadius: '0.375rem',
-                                    background: 'rgba(245,158,11,0.06)', border: '1px solid rgba(245,158,11,0.2)',
-                                }}>
-                                    <div style={{ fontFamily: 'monospace', fontSize: '0.68rem', fontWeight: '600', color: '#F59E0B', textTransform: 'uppercase', letterSpacing: '0.06em', marginBottom: '0.35rem' }}>
-                                        Ivanti Reviewer Notes
+                            {/* Ivanti reviewer notes (rework/approval/previous state feedback) */}
+                            {(() => {
+                                const notes = [
+                                    submission.ivanti_rework_note && { label: 'Rework Note', text: submission.ivanti_rework_note },
+                                    submission.ivanti_approval_note && { label: 'Approval Note', text: submission.ivanti_approval_note },
+                                    submission.ivanti_current_state_notes && { label: 'Current State Notes', text: submission.ivanti_current_state_notes },
+                                    submission.ivanti_previous_state_notes && { label: 'Previous State Notes', text: submission.ivanti_previous_state_notes },
+                                ].filter(Boolean);
+                                return notes.length > 0 ? notes.map((note, idx) => (
+                                    <div key={idx} style={{
+                                        padding: '0.625rem 0.75rem', marginBottom: '0.5rem',
+                                        borderRadius: '0.375rem',
+                                        background: 'rgba(245,158,11,0.06)', border: '1px solid rgba(245,158,11,0.2)',
+                                    }}>
+                                        <div style={{ fontFamily: 'monospace', fontSize: '0.68rem', fontWeight: '600', color: '#F59E0B', textTransform: 'uppercase', letterSpacing: '0.06em', marginBottom: '0.35rem' }}>
+                                            {note.label}
+                                        </div>
+                                        <div style={{ fontFamily: 'monospace', fontSize: '0.72rem', color: '#CBD5E1', whiteSpace: 'pre-wrap', lineHeight: 1.5 }}>
+                                            {note.text}
+                                        </div>
                                     </div>
-                                    <div style={{ fontFamily: 'monospace', fontSize: '0.72rem', color: '#CBD5E1', whiteSpace: 'pre-wrap', lineHeight: 1.5 }}>
-                                        {submission.ivanti_rework_note || submission.ivanti_current_state_notes}
-                                    </div>
-                                </div>
-                            )}
+                                )) : null;
+                            })()}
                             {history.length === 0 ? (
                                 <div style={{ fontFamily: 'monospace', fontSize: '0.72rem', color: '#475569', textAlign: 'center', padding: '2rem 0' }}>
                                     No history entries.