--- c:\james-2.2.0-src-original\src\java\org\apache\james\fetchmail\MessageProcessor.java 2004-05-01 23:47:22.000000000 +0200 +++ c:\james-2.2.0-src\src\java\org\apache\james\fetchmail\MessageProcessor.java 2004-06-24 13:33:28.578125000 +0200 @@ -683,11 +683,11 @@ protected String computeRemoteDomain() throws MessagingException { StringBuffer domainBuffer = new StringBuffer(); String[] headers = null; if (getRemoteReceivedHeaderIndex() > -1) - getMessageIn().getHeader(RFC2822Headers.RECEIVED); + headers = getMessageIn().getHeader(RFC2822Headers.RECEIVED); if (null != headers) { // If there are RECEIVED headers and the index to begin at is greater // than -1, try and extract the domain