1diff --git a/lib/mhamain.pl b/lib/mhamain.pl
2index 80980a2..c1259ce 100644
3--- a/lib/mhamain.pl
4+++ b/lib/mhamain.pl
5@@ -1562,7 +1562,7 @@ sub signal_catch {
6 ##
7 sub defineIndex2MsgId {
8 no warnings qw(deprecated);
9- if (!defined(%Index2MsgId)) {
10+ unless (%Index2MsgId) {
11 foreach (keys %MsgId) {
12 $Index2MsgId{$MsgId{$_}} = $_;
13 }
14diff --git a/lib/mhopt.pl b/lib/mhopt.pl
15index 02fb05e..939109b 100644
16--- a/lib/mhopt.pl
17+++ b/lib/mhopt.pl
18@@ -865,7 +865,7 @@ sub update_data_1_to_2 {
19 sub update_data_2_1_to_later {
20 no warnings qw(deprecated);
21 # we can preserve filter arguments
22- if (defined(%main::MIMEFiltersArgs)) {
23+ if (%main::MIMEFiltersArgs) {
24 warn qq/ preserving MIMEARGS...\n/;
25 %readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs;
26 $IsDefault{'MIMEARGS'} = 0;