diff --git a/src/java/davmail/DavGateway.java b/src/java/davmail/DavGateway.java index 17d024c1..b7d53b3a 100644 --- a/src/java/davmail/DavGateway.java +++ b/src/java/davmail/DavGateway.java @@ -2,7 +2,6 @@ package davmail; import davmail.caldav.CaldavServer; import davmail.exchange.ExchangeSessionFactory; -import davmail.exchange.NetworkDownException; import davmail.http.DavGatewayHttpClientFacade; import davmail.http.DavGatewaySSLProtocolSocketFactory; import davmail.ldap.LdapServer; diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java index 8ac1edc8..3943d1cf 100644 --- a/src/java/davmail/exchange/ExchangeSession.java +++ b/src/java/davmail/exchange/ExchangeSession.java @@ -634,7 +634,7 @@ public class ExchangeSession { } } // patch thunderbird html in reply for correct outlook display - if (line.startsWith("")) { + if (line != null && line.startsWith("")) { mailBuffer.append(line).append("\n"); line = " "; } diff --git a/src/java/davmail/ui/SwtDesktopBrowser.java b/src/java/davmail/ui/SwtDesktopBrowser.java index f9e57ad3..f4bc186c 100644 --- a/src/java/davmail/ui/SwtDesktopBrowser.java +++ b/src/java/davmail/ui/SwtDesktopBrowser.java @@ -2,7 +2,6 @@ package davmail.ui; import org.eclipse.swt.program.Program; -import java.io.IOException; import java.net.URI; /**