diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java
index dd22f6839d..90fd882cee 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java
@@ -125,7 +125,7 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel {
         messageDetailsPane.setBorder(null);
         messageDetailsPane.setContentType(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class,
                                                                                "IngestMessageDetailsPanel.messageDetailsPane.contentType")); // NOI18N
-        messageDetailsPane.setFont(new java.awt.Font(messageDetailsPane.getFont().getName(), Font.PLAIN, 10));
+        messageDetailsPane.setFont(messageDetailsPane.getFont().deriveFont(Font.PLAIN, 10));
         messageDetailsPane.setToolTipText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class,
                                                                                "IngestMessageDetailsPanel.messageDetailsPane.toolTipText")); // NOI18N
         jScrollPane1.setViewportView(messageDetailsPane);
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
index 8d4c6c37c7..fefe0b7add 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
@@ -130,7 +130,7 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
         jScrollPane1.setPreferredSize(new java.awt.Dimension(32767, 32767));
 
         messageTable.setBackground(new java.awt.Color(221, 221, 235));
-        messageTable.setFont(new java.awt.Font(messageTable.getFont().getName(), Font.PLAIN, 12));
+        messageTable.setFont(messageTable.getFont().deriveFont(Font.PLAIN, 12));
         messageTable.setModel(tableModel);
         messageTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);
         messageTable.setAutoscrolls(false);
@@ -867,7 +867,7 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
             cell.setHorizontalAlignment(SwingConstants.CENTER);
             
             // increase the font size
-            cell.setFont(new Font(cell.getFont().getName(), Font.PLAIN, 16));
+            cell.setFont(cell.getFont().deriveFont(Font.PLAIN, 16));
             
             final IngestMessageGroup messageGroup = tableModel.getMessageGroup(row);
             if (messageGroup != null) {
@@ -900,8 +900,8 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
             Component cell = super.getTableCellRendererComponent(
                     table, value, false, false, row, column);
 
-            Font visitedFont = new Font(cell.getFont().getName(), Font.PLAIN, 12);
-            Font notVisitedFont = new Font(cell.getFont().getName(), Font.BOLD, 12);
+            Font visitedFont = cell.getFont().deriveFont(Font.PLAIN, 12);
+            Font notVisitedFont = cell.getFont().deriveFont(Font.BOLD, 12);
             
             if (column == 3) {
                 String subject = (String)value;
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java
index fe3614ce98..194855ad06 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java
@@ -177,7 +177,6 @@ import org.sleuthkit.autopsy.casemodule.Case;
     private static class IngestMessagesButton extends JButton {
 
         private static final int fontSize = 9;
-//        private static final Font messagesFont = new java.awt.Font("Tahoma", Font.PLAIN, fontSize); //NON-NLS
         private int messages = 0;
 
         @Override
@@ -188,7 +187,7 @@ import org.sleuthkit.autopsy.casemodule.Case;
                 return;
             }
             //paint text
-            Font messagesFont = new java.awt.Font(g.getFont().getName(), Font.PLAIN, fontSize);
+            Font messagesFont = g.getFont().deriveFont(Font.PLAIN, fontSize);
             String messageStr = Integer.toString(messages);
             final int len = messageStr.length();
             g.setFont(messagesFont);