diff --git a/ChangeLog b/ChangeLog
index 7b72ceaa5..c326f0ae0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-01-06 TADA Tadashi <sho@spc.gr.jp>
+	* tdiary/lang/ja.rb: [workaround] support 'from encoding' specified by @options['encode_from'].
+
 2008-01-05 TADA Tadashi <sho@spc.gr.jp>
 	* plugin/00default.rb: hide comment form when over comments per day on mobile mode.
 
diff --git a/tdiary.rb b/tdiary.rb
index 7f4b49986..b9187ab38 100644
--- a/tdiary.rb
+++ b/tdiary.rb
@@ -1,13 +1,13 @@
 =begin
 == NAME
 tDiary: the "tsukkomi-able" web diary system.
-tdiary.rb $Revision: 1.326 $
+tdiary.rb $Revision: 1.327 $
 
 Copyright (C) 2001-2007, TADA Tadashi <sho@spc.gr.jp>
 You can redistribute it and/or modify it under GPL2.
 =end
 
-TDIARY_VERSION = '2.2.0.20080105'
+TDIARY_VERSION = '2.2.0.20080106'
 
 $:.insert( 1, File::dirname( __FILE__ ) + '/misc/lib' )
 
diff --git a/tdiary/lang/ja.rb b/tdiary/lang/ja.rb
index ae7bade1f..5248cd4a4 100644
--- a/tdiary/lang/ja.rb
+++ b/tdiary/lang/ja.rb
@@ -32,6 +32,7 @@ def to_native( str, charset = nil )
 		else
 			''
 	end
+	from = @options['encode_from'] if @options['encode_from'] and from.size == 0
 	NKF::nkf( "-m0 -#{from}e", str )
 end